Align task response types with MCP spec#658

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
alexhancock merged 1 commit into from
Feb 13, 2026
Merged

Align task response types with MCP spec #658

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
39 changes: 23 additions & 16 deletions crates/rmcp-macros/src/task_handler.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
status: rmcp::model::TaskStatus::Working,
status_message: None,
created_at: timestamp.clone(),
last_updated_at: Some(timestamp),
last_updated_at: timestamp,
ttl: None,
poll_interval: None,
}
Expand DownExpand Up@@ -111,7 +111,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
status: rmcp::model::TaskStatus::Working,
status_message: Some("Task accepted".to_string()),
created_at: timestamp.clone(),
last_updated_at: Some(timestamp),
last_updated_at: timestamp,
ttl: None,
poll_interval: None,
};
Expand All@@ -128,7 +128,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
&self,
request: rmcp::model::GetTaskInfoParam,
_context: rmcp::service::RequestContext<rmcp::RoleServer>,
) -> Result<rmcp::model::GetTaskInfoResult, McpError> {
) -> Result<rmcp::model::GetTaskResult, McpError> {
use rmcp::task_manager::current_timestamp;
let task_id = request.task_id.clone();
let mut processor = (#processor).lock().await;
Expand DownExpand Up@@ -156,11 +156,11 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
status,
status_message: None,
created_at: timestamp.clone(),
last_updated_at: Some(timestamp),
last_updated_at: timestamp,
ttl: completed_result.descriptor.ttl,
poll_interval: None,
};
return Ok(rmcp::model::GetTaskInfoResult { task: Some(task) });
return Ok(rmcp::model::GetTaskResult { meta: None, task });
}

// If not completed, check running
Expand All@@ -172,14 +172,14 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
status: rmcp::model::TaskStatus::Working,
status_message: None,
created_at: timestamp.clone(),
last_updated_at: Some(timestamp),
last_updated_at: timestamp,
ttl: None,
poll_interval: None,
};
return Ok(rmcp::model::GetTaskInfoResult { task: Some(task) });
return Ok(rmcp::model::GetTaskResult { meta: None, task });
}

Ok(rmcp::model::GetTaskInfoResult { task: None })
Err(McpError::resource_not_found(format!("task not found: {}", task_id), None))
}
};
item_impl.items.push(syn::parse2::<ImplItem>(get_info_fn)?);
Expand All@@ -191,7 +191,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
&self,
request: rmcp::model::GetTaskResultParam,
_context: rmcp::service::RequestContext<rmcp::RoleServer>,
) -> Result<rmcp::model::TaskResult, McpError> {
) -> Result<rmcp::model::GetTaskPayloadResult, McpError> {
use std::time::Duration;
let task_id = request.task_id.clone();

Expand All@@ -207,11 +207,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
match &tool.result {
Ok(call_tool) => {
let value = ::serde_json::to_value(call_tool).unwrap_or(::serde_json::Value::Null);
return Ok(rmcp::model::TaskResult {
content_type: "application/json".to_string(),
value,
summary: None,
});
return Ok(rmcp::model::GetTaskPayloadResult(value));
}
Err(err) => return Err(McpError::internal_error(
format!("task failed: {}", err),
Expand DownExpand Up@@ -251,12 +247,23 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
&self,
request: rmcp::model::CancelTaskParam,
_context: rmcp::service::RequestContext<rmcp::RoleServer>,
) -> Result<(), McpError> {
) -> Result<rmcp::model::CancelTaskResult, McpError> {
use rmcp::task_manager::current_timestamp;
let task_id = request.task_id;
let mut processor = (#processor).lock().await;

if processor.cancel_task(&task_id) {
return Ok(());
let timestamp = current_timestamp();
let task = rmcp::model::Task {
task_id,
status: rmcp::model::TaskStatus::Cancelled,
status_message: None,
created_at: timestamp.clone(),
last_updated_at: timestamp,
ttl: None,
poll_interval: None,
};
return Ok(rmcp::model::CancelTaskResult { meta: None, task });
}

// If already completed, signal it's not cancellable
Expand Down
19 changes: 10 additions & 9 deletions crates/rmcp/src/handler/server.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,15 +116,15 @@ impl<H: ServerHandler> Service<RoleServer> for H {
ClientRequest::GetTaskInfoRequest(request) => self
.get_task_info(request.params, context)
.await
.map(ServerResult::GetTaskInfoResult),
.map(ServerResult::GetTaskResult),
ClientRequest::GetTaskResultRequest(request) => self
.get_task_result(request.params, context)
.await
.map(ServerResult::TaskResult),
.map(ServerResult::GetTaskPayloadResult),
ClientRequest::CancelTaskRequest(request) => self
.cancel_task(request.params, context)
.await
.map(ServerResult::empty),
.map(ServerResult::CancelTaskResult),
}
}

Expand DownExpand Up@@ -339,15 +339,16 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
&self,
request: GetTaskInfoParams,
context: RequestContext<RoleServer>,
) -> impl Future<Output = Result<GetTaskInfoResult, McpError>> + Send + '_ {
) -> impl Future<Output = Result<GetTaskResult, McpError>> + Send + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<GetTaskInfoMethod>()))
}

fn get_task_result(
&self,
request: GetTaskResultParams,
context: RequestContext<RoleServer>,
) -> impl Future<Output = Result<TaskResult, McpError>> + Send + '_ {
) -> impl Future<Output = Result<GetTaskPayloadResult, McpError>> + Send + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<GetTaskResultMethod>()))
}
Expand All@@ -356,7 +357,7 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
&self,
request: CancelTaskParams,
context: RequestContext<RoleServer>,
) -> impl Future<Output = Result<(), McpError>> + Send + '_ {
) -> impl Future<Output = Result<CancelTaskResult, McpError>> + Send + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<CancelTaskMethod>()))
}
Expand DownExpand Up@@ -543,23 +544,23 @@ macro_rules! impl_server_handler_for_wrapper {
&self,
request: GetTaskInfoParams,
context: RequestContext<RoleServer>,
) -> impl Future<Output = Result<GetTaskInfoResult, McpError>> + Send + '_ {
) -> impl Future<Output = Result<GetTaskResult, McpError>> + Send + '_ {
(**self).get_task_info(request, context)
}

fn get_task_result(
&self,
request: GetTaskResultParams,
context: RequestContext<RoleServer>,
) -> impl Future<Output = Result<TaskResult, McpError>> + Send + '_ {
) -> impl Future<Output = Result<GetTaskPayloadResult, McpError>> + Send + '_ {
(**self).get_task_result(request, context)
}

fn cancel_task(
&self,
request: CancelTaskParams,
context: RequestContext<RoleServer>,
) -> impl Future<Output = Result<(), McpError>> + Send + '_ {
) -> impl Future<Output = Result<CancelTaskResult, McpError>> + Send + '_ {
(**self).cancel_task(request, context)
}
}
Expand Down
16 changes: 6 additions & 10 deletions crates/rmcp/src/model.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2537,14 +2537,9 @@ impl RequestParamsMeta for CancelTaskParams {
/// Deprecated: Use [`CancelTaskParams`] instead (SEP-1319 compliance).
#[deprecated(since = "0.13.0", note = "Use CancelTaskParams instead")]
pub type CancelTaskParam = CancelTaskParams;
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[serde(rename_all = "camelCase")]
#[serde(deny_unknown_fields)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct GetTaskInfoResult {
#[serde(skip_serializing_if = "Option::is_none")]
pub task: Option<crate::model::Task>,
}
/// Deprecated: Use [`GetTaskResult`] instead (spec alignment).
#[deprecated(since = "0.15.0", note = "Use GetTaskResult instead")]
pub type GetTaskInfoResult = GetTaskResult;

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Default)]
#[serde(rename_all = "camelCase")]
Expand DownExpand Up@@ -2720,9 +2715,10 @@ ts_union!(
| EmptyResult
| CreateTaskResult
| ListTasksResult
| GetTaskInfoResult
| TaskResult
| GetTaskResult
| CancelTaskResult
| CustomResult
| GetTaskPayloadResult
;
);

Expand Down
61 changes: 44 additions & 17 deletions crates/rmcp/src/model/task.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
use serde::{Deserialize, Serialize};
use serde_json::Value;

use super::Meta;

/// Canonical task lifecycle status as defined by SEP-1686.
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
#[serde(rename_all = "snake_case")]
Expand All@@ -19,21 +21,10 @@ pub enum TaskStatus {
Cancelled,
}

/// Final result for a succeeded task (returned from `tasks/result`).
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct TaskResult {
/// MIME type or custom content-type identifier.
pub content_type: String,
/// The actual result payload, matching the underlying request's schema.
pub value: Value,
/// Optional short summary for UI surfaces.
#[serde(skip_serializing_if = "Option::is_none")]
pub summary: Option<String>,
}

/// Primary Task object that surfaces metadata during the task lifecycle.
///
/// Per spec, `lastUpdatedAt` and `ttl` are required fields.
/// `ttl` is nullable (`null` means unlimited retention).
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Default)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
Expand All@@ -48,10 +39,9 @@ pub struct Task {
/// ISO-8601 creation timestamp.
pub created_at: String,
/// ISO-8601 timestamp for the most recent status change.
#[serde(skip_serializing_if = "Option::is_none")]
pub last_updated_at: Option<String>,
pub last_updated_at: String,
/// Retention window in milliseconds that the receiver agreed to honor.
#[serde(skip_serializing_if = "Option::is_none")]
/// `None` (serialized as `null`) means unlimited retention.
pub ttl: Option<u64>,
/// Suggested polling interval (milliseconds).
#[serde(skip_serializing_if = "Option::is_none")]
Expand All@@ -66,6 +56,43 @@ pub struct CreateTaskResult {
pub task: Task,
}

/// Response to a `tasks/get` request.
///
/// Per spec, `GetTaskResult = allOf[Result, Task]` — the Task fields are
/// flattened at the top level, not nested under a `task` key.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct GetTaskResult {
#[serde(rename = "_meta", default, skip_serializing_if = "Option::is_none")]
pub meta: Option<Meta>,
#[serde(flatten)]
pub task: Task,
}

/// Response to a `tasks/result` request.
///
/// Per spec, the result structure matches the original request type
/// (e.g., `CallToolResult` for `tools/call`). This is represented as
/// an open object. The payload is the original request's result
/// serialized as a JSON value.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct GetTaskPayloadResult(pub Value);

/// Response to a `tasks/cancel` request.
///
/// Per spec, `CancelTaskResult = allOf[Result, Task]` — same shape as `GetTaskResult`.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct CancelTaskResult {
#[serde(rename = "_meta", default, skip_serializing_if = "Option::is_none")]
pub meta: Option<Meta>,
#[serde(flatten)]
pub task: Task,
}

/// Paginated list of tasks
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
Expand Down
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
Align task response types with MCP spec#658

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

alexhancock
merged 1 commit into

from

Feb 13, 2026
 Merged


Align task response types with MCP spec
#658
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


39 changes: 23 additions & 16 deletions
crates/rmcp-macros/src/task_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 status: rmcp::model::TaskStatus::Working,
 status_message: None,
 created_at: timestamp.clone(),
 last_updated_at: Some(timestamp),
 last_updated_at: timestamp,
 ttl: None,
 poll_interval: None,
 }
Expand DownExpand Up@@ -111,7 +111,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 status: rmcp::model::TaskStatus::Working,
 status_message: Some("Task accepted".to_string()),
 created_at: timestamp.clone(),
 last_updated_at: Some(timestamp),
 last_updated_at: timestamp,
 ttl: None,
 poll_interval: None,
 };
Expand All@@ -128,7 +128,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 &self,
 request: rmcp::model::GetTaskInfoParam,
 _context: rmcp::service::RequestContext<rmcp::RoleServer>,
 ) -> Result<rmcp::model::GetTaskInfoResult, McpError> {
 ) -> Result<rmcp::model::GetTaskResult, McpError> {
 use rmcp::task_manager::current_timestamp;
 let task_id = request.task_id.clone();
 let mut processor = (#processor).lock().await;
Expand DownExpand Up@@ -156,11 +156,11 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 status,
 status_message: None,
 created_at: timestamp.clone(),
 last_updated_at: Some(timestamp),
 last_updated_at: timestamp,
 ttl: completed_result.descriptor.ttl,
 poll_interval: None,
 };
 return Ok(rmcp::model::GetTaskInfoResult { task: Some(task) });
 return Ok(rmcp::model::GetTaskResult { meta: None, task });
 }

 // If not completed, check running
Expand All@@ -172,14 +172,14 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 status: rmcp::model::TaskStatus::Working,
 status_message: None,
 created_at: timestamp.clone(),
 last_updated_at: Some(timestamp),
 last_updated_at: timestamp,
 ttl: None,
 poll_interval: None,
 };
 return Ok(rmcp::model::GetTaskInfoResult { task: Some(task) });
 return Ok(rmcp::model::GetTaskResult { meta: None, task });
 }

Ok(rmcp::model::GetTaskInfoResult { task: None })
Err(McpError::resource_not_found(format!("task not found: {}", task_id), None))
 }
 };
 item_impl.items.push(syn::parse2::<ImplItem>(get_info_fn)?);
Expand All@@ -191,7 +191,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 &self,
 request: rmcp::model::GetTaskResultParam,
 _context: rmcp::service::RequestContext<rmcp::RoleServer>,
 ) -> Result<rmcp::model::TaskResult, McpError> {
 ) -> Result<rmcp::model::GetTaskPayloadResult, McpError> {
 use std::time::Duration;
 let task_id = request.task_id.clone();

Expand All@@ -207,11 +207,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 match &tool.result {
 Ok(call_tool) => {
 let value = ::serde_json::to_value(call_tool).unwrap_or(::serde_json::Value::Null);
 return Ok(rmcp::model::TaskResult {
 content_type: "application/json".to_string(),
 value,
 summary: None,
 });
 return Ok(rmcp::model::GetTaskPayloadResult(value));
 }
 Err(err) => return Err(McpError::internal_error(
 format!("task failed: {}", err),
Expand DownExpand Up@@ -251,12 +247,23 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 &self,
 request: rmcp::model::CancelTaskParam,
 _context: rmcp::service::RequestContext<rmcp::RoleServer>,
 ) -> Result<(), McpError> {
 ) -> Result<rmcp::model::CancelTaskResult, McpError> {
 use rmcp::task_manager::current_timestamp;
 let task_id = request.task_id;
 let mut processor = (#processor).lock().await;

 if processor.cancel_task(&task_id) {
 return Ok(());
 let timestamp = current_timestamp();
 let task = rmcp::model::Task {
 task_id,
 status: rmcp::model::TaskStatus::Cancelled,
 status_message: None,
 created_at: timestamp.clone(),
 last_updated_at: timestamp,
 ttl: None,
 poll_interval: None,
 };
 return Ok(rmcp::model::CancelTaskResult { meta: None, task });
 }

 // If already completed, signal it's not cancellable
Expand Down

19 changes: 10 additions & 9 deletions
crates/rmcp/src/handler/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -116,15 +116,15 @@ impl<H: ServerHandler> Service<RoleServer> for H {
 ClientRequest::GetTaskInfoRequest(request) => self
 .get_task_info(request.params, context)
 .await
 .map(ServerResult::GetTaskInfoResult),
 .map(ServerResult::GetTaskResult),
 ClientRequest::GetTaskResultRequest(request) => self
 .get_task_result(request.params, context)
 .await
 .map(ServerResult::TaskResult),
 .map(ServerResult::GetTaskPayloadResult),
 ClientRequest::CancelTaskRequest(request) => self
 .cancel_task(request.params, context)
 .await
 .map(ServerResult::empty),
 .map(ServerResult::CancelTaskResult),
 }
 }

Expand DownExpand Up@@ -339,15 +339,16 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
 &self,
 request: GetTaskInfoParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<GetTaskInfoResult, McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<GetTaskResult, McpError>> + Send + '_ {
 let _ = (request, context);
 std::future::ready(Err(McpError::method_not_found::<GetTaskInfoMethod>()))
 }

 fn get_task_result(
 &self,
 request: GetTaskResultParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<TaskResult, McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<GetTaskPayloadResult, McpError>> + Send + '_ {
 let _ = (request, context);
 std::future::ready(Err(McpError::method_not_found::<GetTaskResultMethod>()))
 }
Expand All@@ -356,7 +357,7 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
 &self,
 request: CancelTaskParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<(), McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<CancelTaskResult, McpError>> + Send + '_ {
 let _ = (request, context);
 std::future::ready(Err(McpError::method_not_found::<CancelTaskMethod>()))
 }
Expand DownExpand Up@@ -543,23 +544,23 @@ macro_rules! impl_server_handler_for_wrapper {
 &self,
 request: GetTaskInfoParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<GetTaskInfoResult, McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<GetTaskResult, McpError>> + Send + '_ {
 (**self).get_task_info(request, context)
 }

 fn get_task_result(
 &self,
 request: GetTaskResultParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<TaskResult, McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<GetTaskPayloadResult, McpError>> + Send + '_ {
 (**self).get_task_result(request, context)
 }

 fn cancel_task(
 &self,
 request: CancelTaskParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<(), McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<CancelTaskResult, McpError>> + Send + '_ {
 (**self).cancel_task(request, context)
 }
 }
Expand Down

16 changes: 6 additions & 10 deletions
crates/rmcp/src/model.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2537,14 +2537,9 @@ impl RequestParamsMeta for CancelTaskParams {
/// Deprecated: Use [`CancelTaskParams`] instead (SEP-1319 compliance).
#[deprecated(since = "0.13.0", note = "Use CancelTaskParams instead")]
pub type CancelTaskParam = CancelTaskParams;
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[serde(rename_all = "camelCase")]
#[serde(deny_unknown_fields)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct GetTaskInfoResult {
 #[serde(skip_serializing_if = "Option::is_none")]
 pub task: Option<crate::model::Task>,
}
/// Deprecated: Use [`GetTaskResult`] instead (spec alignment).
#[deprecated(since = "0.15.0", note = "Use GetTaskResult instead")]
pub type GetTaskInfoResult = GetTaskResult;

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Default)]
#[serde(rename_all = "camelCase")]
Expand DownExpand Up@@ -2720,9 +2715,10 @@ ts_union!(
 | EmptyResult
 | CreateTaskResult
 | ListTasksResult
 | GetTaskInfoResult
 | TaskResult
 | GetTaskResult
 | CancelTaskResult
 | CustomResult
 | GetTaskPayloadResult
 ;
);

Expand Down

61 changes: 44 additions & 17 deletions
crates/rmcp/src/model/task.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
use serde::{Deserialize, Serialize};
use serde_json::Value;

use super::Meta;

/// Canonical task lifecycle status as defined by SEP-1686.
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
#[serde(rename_all = "snake_case")]
Expand All@@ -19,21 +21,10 @@ pub enum TaskStatus {
 Cancelled,
}

/// Final result for a succeeded task (returned from `tasks/result`).
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct TaskResult {
 /// MIME type or custom content-type identifier.
 pub content_type: String,
 /// The actual result payload, matching the underlying request's schema.
 pub value: Value,
 /// Optional short summary for UI surfaces.
 #[serde(skip_serializing_if = "Option::is_none")]
 pub summary: Option<String>,
}

/// Primary Task object that surfaces metadata during the task lifecycle.
///
/// Per spec, `lastUpdatedAt` and `ttl` are required fields.
/// `ttl` is nullable (`null` means unlimited retention).
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Default)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
Expand All@@ -48,10 +39,9 @@ pub struct Task {
 /// ISO-8601 creation timestamp.
 pub created_at: String,
 /// ISO-8601 timestamp for the most recent status change.
 #[serde(skip_serializing_if = "Option::is_none")]
 pub last_updated_at: Option<String>,
 pub last_updated_at: String,
 /// Retention window in milliseconds that the receiver agreed to honor.
#[serde(skip_serializing_if = "Option::is_none")]
/// `None` (serialized as `null`) means unlimited retention.
 pub ttl: Option<u64>,
 /// Suggested polling interval (milliseconds).
 #[serde(skip_serializing_if = "Option::is_none")]
Expand All@@ -66,6 +56,43 @@ pub struct CreateTaskResult {
 pub task: Task,
}

/// Response to a `tasks/get` request.
///
/// Per spec, `GetTaskResult = allOf[Result, Task]` — the Task fields are
/// flattened at the top level, not nested under a `task` key.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct GetTaskResult {
 #[serde(rename = "_meta", default, skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,
 #[serde(flatten)]
 pub task: Task,
}

/// Response to a `tasks/result` request.
///
/// Per spec, the result structure matches the original request type
/// (e.g., `CallToolResult` for `tools/call`). This is represented as
/// an open object. The payload is the original request's result
/// serialized as a JSON value.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct GetTaskPayloadResult(pub Value);

/// Response to a `tasks/cancel` request.
///
/// Per spec, `CancelTaskResult = allOf[Result, Task]` — same shape as `GetTaskResult`.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct CancelTaskResult {
 #[serde(rename = "_meta", default, skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,
 #[serde(flatten)]
 pub task: Task,
}

/// Paginated list of tasks
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
Expand Down
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
Align task response types with MCP spec#658

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

alexhancock
merged 1 commit into

from

Feb 13, 2026
 Merged


Align task response types with MCP spec
#658
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


39 changes: 23 additions & 16 deletions
crates/rmcp-macros/src/task_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 status: rmcp::model::TaskStatus::Working,
 status_message: None,
 created_at: timestamp.clone(),
 last_updated_at: Some(timestamp),
 last_updated_at: timestamp,
 ttl: None,
 poll_interval: None,
 }
Expand DownExpand Up@@ -111,7 +111,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 status: rmcp::model::TaskStatus::Working,
 status_message: Some("Task accepted".to_string()),
 created_at: timestamp.clone(),
 last_updated_at: Some(timestamp),
 last_updated_at: timestamp,
 ttl: None,
 poll_interval: None,
 };
Expand All@@ -128,7 +128,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 &self,
 request: rmcp::model::GetTaskInfoParam,
 _context: rmcp::service::RequestContext<rmcp::RoleServer>,
 ) -> Result<rmcp::model::GetTaskInfoResult, McpError> {
 ) -> Result<rmcp::model::GetTaskResult, McpError> {
 use rmcp::task_manager::current_timestamp;
 let task_id = request.task_id.clone();
 let mut processor = (#processor).lock().await;
Expand DownExpand Up@@ -156,11 +156,11 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 status,
 status_message: None,
 created_at: timestamp.clone(),
 last_updated_at: Some(timestamp),
 last_updated_at: timestamp,
 ttl: completed_result.descriptor.ttl,
 poll_interval: None,
 };
 return Ok(rmcp::model::GetTaskInfoResult { task: Some(task) });
 return Ok(rmcp::model::GetTaskResult { meta: None, task });
 }

 // If not completed, check running
Expand All@@ -172,14 +172,14 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 status: rmcp::model::TaskStatus::Working,
 status_message: None,
 created_at: timestamp.clone(),
 last_updated_at: Some(timestamp),
 last_updated_at: timestamp,
 ttl: None,
 poll_interval: None,
 };
 return Ok(rmcp::model::GetTaskInfoResult { task: Some(task) });
 return Ok(rmcp::model::GetTaskResult { meta: None, task });
 }

Ok(rmcp::model::GetTaskInfoResult { task: None })
Err(McpError::resource_not_found(format!("task not found: {}", task_id), None))
 }
 };
 item_impl.items.push(syn::parse2::<ImplItem>(get_info_fn)?);
Expand All@@ -191,7 +191,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 &self,
 request: rmcp::model::GetTaskResultParam,
 _context: rmcp::service::RequestContext<rmcp::RoleServer>,
 ) -> Result<rmcp::model::TaskResult, McpError> {
 ) -> Result<rmcp::model::GetTaskPayloadResult, McpError> {
 use std::time::Duration;
 let task_id = request.task_id.clone();

Expand All@@ -207,11 +207,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 match &tool.result {
 Ok(call_tool) => {
 let value = ::serde_json::to_value(call_tool).unwrap_or(::serde_json::Value::Null);
 return Ok(rmcp::model::TaskResult {
 content_type: "application/json".to_string(),
 value,
 summary: None,
 });
 return Ok(rmcp::model::GetTaskPayloadResult(value));
 }
 Err(err) => return Err(McpError::internal_error(
 format!("task failed: {}", err),
Expand DownExpand Up@@ -251,12 +247,23 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 &self,
 request: rmcp::model::CancelTaskParam,
 _context: rmcp::service::RequestContext<rmcp::RoleServer>,
 ) -> Result<(), McpError> {
 ) -> Result<rmcp::model::CancelTaskResult, McpError> {
 use rmcp::task_manager::current_timestamp;
 let task_id = request.task_id;
 let mut processor = (#processor).lock().await;

 if processor.cancel_task(&task_id) {
 return Ok(());
 let timestamp = current_timestamp();
 let task = rmcp::model::Task {
 task_id,
 status: rmcp::model::TaskStatus::Cancelled,
 status_message: None,
 created_at: timestamp.clone(),
 last_updated_at: timestamp,
 ttl: None,
 poll_interval: None,
 };
 return Ok(rmcp::model::CancelTaskResult { meta: None, task });
 }

 // If already completed, signal it's not cancellable
Expand Down

19 changes: 10 additions & 9 deletions
crates/rmcp/src/handler/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -116,15 +116,15 @@ impl<H: ServerHandler> Service<RoleServer> for H {
 ClientRequest::GetTaskInfoRequest(request) => self
 .get_task_info(request.params, context)
 .await
 .map(ServerResult::GetTaskInfoResult),
 .map(ServerResult::GetTaskResult),
 ClientRequest::GetTaskResultRequest(request) => self
 .get_task_result(request.params, context)
 .await
 .map(ServerResult::TaskResult),
 .map(ServerResult::GetTaskPayloadResult),
 ClientRequest::CancelTaskRequest(request) => self
 .cancel_task(request.params, context)
 .await
 .map(ServerResult::empty),
 .map(ServerResult::CancelTaskResult),
 }
 }

Expand DownExpand Up@@ -339,15 +339,16 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
 &self,
 request: GetTaskInfoParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<GetTaskInfoResult, McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<GetTaskResult, McpError>> + Send + '_ {
 let _ = (request, context);
 std::future::ready(Err(McpError::method_not_found::<GetTaskInfoMethod>()))
 }

 fn get_task_result(
 &self,
 request: GetTaskResultParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<TaskResult, McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<GetTaskPayloadResult, McpError>> + Send + '_ {
 let _ = (request, context);
 std::future::ready(Err(McpError::method_not_found::<GetTaskResultMethod>()))
 }
Expand All@@ -356,7 +357,7 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
 &self,
 request: CancelTaskParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<(), McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<CancelTaskResult, McpError>> + Send + '_ {
 let _ = (request, context);
 std::future::ready(Err(McpError::method_not_found::<CancelTaskMethod>()))
 }
Expand DownExpand Up@@ -543,23 +544,23 @@ macro_rules! impl_server_handler_for_wrapper {
 &self,
 request: GetTaskInfoParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<GetTaskInfoResult, McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<GetTaskResult, McpError>> + Send + '_ {
 (**self).get_task_info(request, context)
 }

 fn get_task_result(
 &self,
 request: GetTaskResultParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<TaskResult, McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<GetTaskPayloadResult, McpError>> + Send + '_ {
 (**self).get_task_result(request, context)
 }

 fn cancel_task(
 &self,
 request: CancelTaskParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<(), McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<CancelTaskResult, McpError>> + Send + '_ {
 (**self).cancel_task(request, context)
 }
 }
Expand Down

16 changes: 6 additions & 10 deletions
crates/rmcp/src/model.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2537,14 +2537,9 @@ impl RequestParamsMeta for CancelTaskParams {
/// Deprecated: Use [`CancelTaskParams`] instead (SEP-1319 compliance).
#[deprecated(since = "0.13.0", note = "Use CancelTaskParams instead")]
pub type CancelTaskParam = CancelTaskParams;
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[serde(rename_all = "camelCase")]
#[serde(deny_unknown_fields)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct GetTaskInfoResult {
 #[serde(skip_serializing_if = "Option::is_none")]
 pub task: Option<crate::model::Task>,
}
/// Deprecated: Use [`GetTaskResult`] instead (spec alignment).
#[deprecated(since = "0.15.0", note = "Use GetTaskResult instead")]
pub type GetTaskInfoResult = GetTaskResult;

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Default)]
#[serde(rename_all = "camelCase")]
Expand DownExpand Up@@ -2720,9 +2715,10 @@ ts_union!(
 | EmptyResult
 | CreateTaskResult
 | ListTasksResult
 | GetTaskInfoResult
 | TaskResult
 | GetTaskResult
 | CancelTaskResult
 | CustomResult
 | GetTaskPayloadResult
 ;
);

Expand Down

61 changes: 44 additions & 17 deletions
crates/rmcp/src/model/task.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
use serde::{Deserialize, Serialize};
use serde_json::Value;

use super::Meta;

/// Canonical task lifecycle status as defined by SEP-1686.
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
#[serde(rename_all = "snake_case")]
Expand All@@ -19,21 +21,10 @@ pub enum TaskStatus {
 Cancelled,
}

/// Final result for a succeeded task (returned from `tasks/result`).
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct TaskResult {
 /// MIME type or custom content-type identifier.
 pub content_type: String,
 /// The actual result payload, matching the underlying request's schema.
 pub value: Value,
 /// Optional short summary for UI surfaces.
 #[serde(skip_serializing_if = "Option::is_none")]
 pub summary: Option<String>,
}

/// Primary Task object that surfaces metadata during the task lifecycle.
///
/// Per spec, `lastUpdatedAt` and `ttl` are required fields.
/// `ttl` is nullable (`null` means unlimited retention).
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Default)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
Expand All@@ -48,10 +39,9 @@ pub struct Task {
 /// ISO-8601 creation timestamp.
 pub created_at: String,
 /// ISO-8601 timestamp for the most recent status change.
 #[serde(skip_serializing_if = "Option::is_none")]
 pub last_updated_at: Option<String>,
 pub last_updated_at: String,
 /// Retention window in milliseconds that the receiver agreed to honor.
#[serde(skip_serializing_if = "Option::is_none")]
/// `None` (serialized as `null`) means unlimited retention.
 pub ttl: Option<u64>,
 /// Suggested polling interval (milliseconds).
 #[serde(skip_serializing_if = "Option::is_none")]
Expand All@@ -66,6 +56,43 @@ pub struct CreateTaskResult {
 pub task: Task,
}

/// Response to a `tasks/get` request.
///
/// Per spec, `GetTaskResult = allOf[Result, Task]` — the Task fields are
/// flattened at the top level, not nested under a `task` key.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct GetTaskResult {
 #[serde(rename = "_meta", default, skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,
 #[serde(flatten)]
 pub task: Task,
}

/// Response to a `tasks/result` request.
///
/// Per spec, the result structure matches the original request type
/// (e.g., `CallToolResult` for `tools/call`). This is represented as
/// an open object. The payload is the original request's result
/// serialized as a JSON value.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct GetTaskPayloadResult(pub Value);

/// Response to a `tasks/cancel` request.
///
/// Per spec, `CancelTaskResult = allOf[Result, Task]` — same shape as `GetTaskResult`.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct CancelTaskResult {
 #[serde(rename = "_meta", default, skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,
 #[serde(flatten)]
 pub task: Task,
}

/// Paginated list of tasks
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
Expand Down
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
Align task response types with MCP spec#658

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

alexhancock
merged 1 commit into

from

Feb 13, 2026
 Merged


Align task response types with MCP spec
#658
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


39 changes: 23 additions & 16 deletions
crates/rmcp-macros/src/task_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 status: rmcp::model::TaskStatus::Working,
 status_message: None,
 created_at: timestamp.clone(),
 last_updated_at: Some(timestamp),
 last_updated_at: timestamp,
 ttl: None,
 poll_interval: None,
 }
Expand DownExpand Up@@ -111,7 +111,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 status: rmcp::model::TaskStatus::Working,
 status_message: Some("Task accepted".to_string()),
 created_at: timestamp.clone(),
 last_updated_at: Some(timestamp),
 last_updated_at: timestamp,
 ttl: None,
 poll_interval: None,
 };
Expand All@@ -128,7 +128,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 &self,
 request: rmcp::model::GetTaskInfoParam,
 _context: rmcp::service::RequestContext<rmcp::RoleServer>,
 ) -> Result<rmcp::model::GetTaskInfoResult, McpError> {
 ) -> Result<rmcp::model::GetTaskResult, McpError> {
 use rmcp::task_manager::current_timestamp;
 let task_id = request.task_id.clone();
 let mut processor = (#processor).lock().await;
Expand DownExpand Up@@ -156,11 +156,11 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 status,
 status_message: None,
 created_at: timestamp.clone(),
 last_updated_at: Some(timestamp),
 last_updated_at: timestamp,
 ttl: completed_result.descriptor.ttl,
 poll_interval: None,
 };
 return Ok(rmcp::model::GetTaskInfoResult { task: Some(task) });
 return Ok(rmcp::model::GetTaskResult { meta: None, task });
 }

 // If not completed, check running
Expand All@@ -172,14 +172,14 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 status: rmcp::model::TaskStatus::Working,
 status_message: None,
 created_at: timestamp.clone(),
 last_updated_at: Some(timestamp),
 last_updated_at: timestamp,
 ttl: None,
 poll_interval: None,
 };
 return Ok(rmcp::model::GetTaskInfoResult { task: Some(task) });
 return Ok(rmcp::model::GetTaskResult { meta: None, task });
 }

Ok(rmcp::model::GetTaskInfoResult { task: None })
Err(McpError::resource_not_found(format!("task not found: {}", task_id), None))
 }
 };
 item_impl.items.push(syn::parse2::<ImplItem>(get_info_fn)?);
Expand All@@ -191,7 +191,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 &self,
 request: rmcp::model::GetTaskResultParam,
 _context: rmcp::service::RequestContext<rmcp::RoleServer>,
 ) -> Result<rmcp::model::TaskResult, McpError> {
 ) -> Result<rmcp::model::GetTaskPayloadResult, McpError> {
 use std::time::Duration;
 let task_id = request.task_id.clone();

Expand All@@ -207,11 +207,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 match &tool.result {
 Ok(call_tool) => {
 let value = ::serde_json::to_value(call_tool).unwrap_or(::serde_json::Value::Null);
 return Ok(rmcp::model::TaskResult {
 content_type: "application/json".to_string(),
 value,
 summary: None,
 });
 return Ok(rmcp::model::GetTaskPayloadResult(value));
 }
 Err(err) => return Err(McpError::internal_error(
 format!("task failed: {}", err),
Expand DownExpand Up@@ -251,12 +247,23 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 &self,
 request: rmcp::model::CancelTaskParam,
 _context: rmcp::service::RequestContext<rmcp::RoleServer>,
 ) -> Result<(), McpError> {
 ) -> Result<rmcp::model::CancelTaskResult, McpError> {
 use rmcp::task_manager::current_timestamp;
 let task_id = request.task_id;
 let mut processor = (#processor).lock().await;

 if processor.cancel_task(&task_id) {
 return Ok(());
 let timestamp = current_timestamp();
 let task = rmcp::model::Task {
 task_id,
 status: rmcp::model::TaskStatus::Cancelled,
 status_message: None,
 created_at: timestamp.clone(),
 last_updated_at: timestamp,
 ttl: None,
 poll_interval: None,
 };
 return Ok(rmcp::model::CancelTaskResult { meta: None, task });
 }

 // If already completed, signal it's not cancellable
Expand Down

19 changes: 10 additions & 9 deletions
crates/rmcp/src/handler/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -116,15 +116,15 @@ impl<H: ServerHandler> Service<RoleServer> for H {
 ClientRequest::GetTaskInfoRequest(request) => self
 .get_task_info(request.params, context)
 .await
 .map(ServerResult::GetTaskInfoResult),
 .map(ServerResult::GetTaskResult),
 ClientRequest::GetTaskResultRequest(request) => self
 .get_task_result(request.params, context)
 .await
 .map(ServerResult::TaskResult),
 .map(ServerResult::GetTaskPayloadResult),
 ClientRequest::CancelTaskRequest(request) => self
 .cancel_task(request.params, context)
 .await
 .map(ServerResult::empty),
 .map(ServerResult::CancelTaskResult),
 }
 }

Expand DownExpand Up@@ -339,15 +339,16 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
 &self,
 request: GetTaskInfoParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<GetTaskInfoResult, McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<GetTaskResult, McpError>> + Send + '_ {
 let _ = (request, context);
 std::future::ready(Err(McpError::method_not_found::<GetTaskInfoMethod>()))
 }

 fn get_task_result(
 &self,
 request: GetTaskResultParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<TaskResult, McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<GetTaskPayloadResult, McpError>> + Send + '_ {
 let _ = (request, context);
 std::future::ready(Err(McpError::method_not_found::<GetTaskResultMethod>()))
 }
Expand All@@ -356,7 +357,7 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
 &self,
 request: CancelTaskParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<(), McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<CancelTaskResult, McpError>> + Send + '_ {
 let _ = (request, context);
 std::future::ready(Err(McpError::method_not_found::<CancelTaskMethod>()))
 }
Expand DownExpand Up@@ -543,23 +544,23 @@ macro_rules! impl_server_handler_for_wrapper {
 &self,
 request: GetTaskInfoParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<GetTaskInfoResult, McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<GetTaskResult, McpError>> + Send + '_ {
 (**self).get_task_info(request, context)
 }

 fn get_task_result(
 &self,
 request: GetTaskResultParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<TaskResult, McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<GetTaskPayloadResult, McpError>> + Send + '_ {
 (**self).get_task_result(request, context)
 }

 fn cancel_task(
 &self,
 request: CancelTaskParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<(), McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<CancelTaskResult, McpError>> + Send + '_ {
 (**self).cancel_task(request, context)
 }
 }
Expand Down

16 changes: 6 additions & 10 deletions
crates/rmcp/src/model.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2537,14 +2537,9 @@ impl RequestParamsMeta for CancelTaskParams {
/// Deprecated: Use [`CancelTaskParams`] instead (SEP-1319 compliance).
#[deprecated(since = "0.13.0", note = "Use CancelTaskParams instead")]
pub type CancelTaskParam = CancelTaskParams;
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[serde(rename_all = "camelCase")]
#[serde(deny_unknown_fields)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct GetTaskInfoResult {
 #[serde(skip_serializing_if = "Option::is_none")]
 pub task: Option<crate::model::Task>,
}
/// Deprecated: Use [`GetTaskResult`] instead (spec alignment).
#[deprecated(since = "0.15.0", note = "Use GetTaskResult instead")]
pub type GetTaskInfoResult = GetTaskResult;

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Default)]
#[serde(rename_all = "camelCase")]
Expand DownExpand Up@@ -2720,9 +2715,10 @@ ts_union!(
 | EmptyResult
 | CreateTaskResult
 | ListTasksResult
 | GetTaskInfoResult
 | TaskResult
 | GetTaskResult
 | CancelTaskResult
 | CustomResult
 | GetTaskPayloadResult
 ;
);

Expand Down

61 changes: 44 additions & 17 deletions
crates/rmcp/src/model/task.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
use serde::{Deserialize, Serialize};
use serde_json::Value;

use super::Meta;

/// Canonical task lifecycle status as defined by SEP-1686.
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
#[serde(rename_all = "snake_case")]
Expand All@@ -19,21 +21,10 @@ pub enum TaskStatus {
 Cancelled,
}

/// Final result for a succeeded task (returned from `tasks/result`).
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct TaskResult {
 /// MIME type or custom content-type identifier.
 pub content_type: String,
 /// The actual result payload, matching the underlying request's schema.
 pub value: Value,
 /// Optional short summary for UI surfaces.
 #[serde(skip_serializing_if = "Option::is_none")]
 pub summary: Option<String>,
}

/// Primary Task object that surfaces metadata during the task lifecycle.
///
/// Per spec, `lastUpdatedAt` and `ttl` are required fields.
/// `ttl` is nullable (`null` means unlimited retention).
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Default)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
Expand All@@ -48,10 +39,9 @@ pub struct Task {
 /// ISO-8601 creation timestamp.
 pub created_at: String,
 /// ISO-8601 timestamp for the most recent status change.
 #[serde(skip_serializing_if = "Option::is_none")]
 pub last_updated_at: Option<String>,
 pub last_updated_at: String,
 /// Retention window in milliseconds that the receiver agreed to honor.
#[serde(skip_serializing_if = "Option::is_none")]
/// `None` (serialized as `null`) means unlimited retention.
 pub ttl: Option<u64>,
 /// Suggested polling interval (milliseconds).
 #[serde(skip_serializing_if = "Option::is_none")]
Expand All@@ -66,6 +56,43 @@ pub struct CreateTaskResult {
 pub task: Task,
}

/// Response to a `tasks/get` request.
///
/// Per spec, `GetTaskResult = allOf[Result, Task]` — the Task fields are
/// flattened at the top level, not nested under a `task` key.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct GetTaskResult {
 #[serde(rename = "_meta", default, skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,
 #[serde(flatten)]
 pub task: Task,
}

/// Response to a `tasks/result` request.
///
/// Per spec, the result structure matches the original request type
/// (e.g., `CallToolResult` for `tools/call`). This is represented as
/// an open object. The payload is the original request's result
/// serialized as a JSON value.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct GetTaskPayloadResult(pub Value);

/// Response to a `tasks/cancel` request.
///
/// Per spec, `CancelTaskResult = allOf[Result, Task]` — same shape as `GetTaskResult`.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct CancelTaskResult {
 #[serde(rename = "_meta", default, skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,
 #[serde(flatten)]
 pub task: Task,
}

/// Paginated list of tasks
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
Expand Down
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
Align task response types with MCP spec#658

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

alexhancock
merged 1 commit into

from

Feb 13, 2026
 Merged


Align task response types with MCP spec
#658
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


39 changes: 23 additions & 16 deletions
crates/rmcp-macros/src/task_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 status: rmcp::model::TaskStatus::Working,
 status_message: None,
 created_at: timestamp.clone(),
 last_updated_at: Some(timestamp),
 last_updated_at: timestamp,
 ttl: None,
 poll_interval: None,
 }
Expand DownExpand Up@@ -111,7 +111,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 status: rmcp::model::TaskStatus::Working,
 status_message: Some("Task accepted".to_string()),
 created_at: timestamp.clone(),
 last_updated_at: Some(timestamp),
 last_updated_at: timestamp,
 ttl: None,
 poll_interval: None,
 };
Expand All@@ -128,7 +128,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 &self,
 request: rmcp::model::GetTaskInfoParam,
 _context: rmcp::service::RequestContext<rmcp::RoleServer>,
 ) -> Result<rmcp::model::GetTaskInfoResult, McpError> {
 ) -> Result<rmcp::model::GetTaskResult, McpError> {
 use rmcp::task_manager::current_timestamp;
 let task_id = request.task_id.clone();
 let mut processor = (#processor).lock().await;
Expand DownExpand Up@@ -156,11 +156,11 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 status,
 status_message: None,
 created_at: timestamp.clone(),
 last_updated_at: Some(timestamp),
 last_updated_at: timestamp,
 ttl: completed_result.descriptor.ttl,
 poll_interval: None,
 };
 return Ok(rmcp::model::GetTaskInfoResult { task: Some(task) });
 return Ok(rmcp::model::GetTaskResult { meta: None, task });
 }

 // If not completed, check running
Expand All@@ -172,14 +172,14 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 status: rmcp::model::TaskStatus::Working,
 status_message: None,
 created_at: timestamp.clone(),
 last_updated_at: Some(timestamp),
 last_updated_at: timestamp,
 ttl: None,
 poll_interval: None,
 };
 return Ok(rmcp::model::GetTaskInfoResult { task: Some(task) });
 return Ok(rmcp::model::GetTaskResult { meta: None, task });
 }

Ok(rmcp::model::GetTaskInfoResult { task: None })
Err(McpError::resource_not_found(format!("task not found: {}", task_id), None))
 }
 };
 item_impl.items.push(syn::parse2::<ImplItem>(get_info_fn)?);
Expand All@@ -191,7 +191,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 &self,
 request: rmcp::model::GetTaskResultParam,
 _context: rmcp::service::RequestContext<rmcp::RoleServer>,
 ) -> Result<rmcp::model::TaskResult, McpError> {
 ) -> Result<rmcp::model::GetTaskPayloadResult, McpError> {
 use std::time::Duration;
 let task_id = request.task_id.clone();

Expand All@@ -207,11 +207,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 match &tool.result {
 Ok(call_tool) => {
 let value = ::serde_json::to_value(call_tool).unwrap_or(::serde_json::Value::Null);
 return Ok(rmcp::model::TaskResult {
 content_type: "application/json".to_string(),
 value,
 summary: None,
 });
 return Ok(rmcp::model::GetTaskPayloadResult(value));
 }
 Err(err) => return Err(McpError::internal_error(
 format!("task failed: {}", err),
Expand DownExpand Up@@ -251,12 +247,23 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 &self,
 request: rmcp::model::CancelTaskParam,
 _context: rmcp::service::RequestContext<rmcp::RoleServer>,
 ) -> Result<(), McpError> {
 ) -> Result<rmcp::model::CancelTaskResult, McpError> {
 use rmcp::task_manager::current_timestamp;
 let task_id = request.task_id;
 let mut processor = (#processor).lock().await;

 if processor.cancel_task(&task_id) {
 return Ok(());
 let timestamp = current_timestamp();
 let task = rmcp::model::Task {
 task_id,
 status: rmcp::model::TaskStatus::Cancelled,
 status_message: None,
 created_at: timestamp.clone(),
 last_updated_at: timestamp,
 ttl: None,
 poll_interval: None,
 };
 return Ok(rmcp::model::CancelTaskResult { meta: None, task });
 }

 // If already completed, signal it's not cancellable
Expand Down

19 changes: 10 additions & 9 deletions
crates/rmcp/src/handler/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -116,15 +116,15 @@ impl<H: ServerHandler> Service<RoleServer> for H {
 ClientRequest::GetTaskInfoRequest(request) => self
 .get_task_info(request.params, context)
 .await
 .map(ServerResult::GetTaskInfoResult),
 .map(ServerResult::GetTaskResult),
 ClientRequest::GetTaskResultRequest(request) => self
 .get_task_result(request.params, context)
 .await
 .map(ServerResult::TaskResult),
 .map(ServerResult::GetTaskPayloadResult),
 ClientRequest::CancelTaskRequest(request) => self
 .cancel_task(request.params, context)
 .await
 .map(ServerResult::empty),
 .map(ServerResult::CancelTaskResult),
 }
 }

Expand DownExpand Up@@ -339,15 +339,16 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
 &self,
 request: GetTaskInfoParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<GetTaskInfoResult, McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<GetTaskResult, McpError>> + Send + '_ {
 let _ = (request, context);
 std::future::ready(Err(McpError::method_not_found::<GetTaskInfoMethod>()))
 }

 fn get_task_result(
 &self,
 request: GetTaskResultParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<TaskResult, McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<GetTaskPayloadResult, McpError>> + Send + '_ {
 let _ = (request, context);
 std::future::ready(Err(McpError::method_not_found::<GetTaskResultMethod>()))
 }
Expand All@@ -356,7 +357,7 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
 &self,
 request: CancelTaskParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<(), McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<CancelTaskResult, McpError>> + Send + '_ {
 let _ = (request, context);
 std::future::ready(Err(McpError::method_not_found::<CancelTaskMethod>()))
 }
Expand DownExpand Up@@ -543,23 +544,23 @@ macro_rules! impl_server_handler_for_wrapper {
 &self,
 request: GetTaskInfoParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<GetTaskInfoResult, McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<GetTaskResult, McpError>> + Send + '_ {
 (**self).get_task_info(request, context)
 }

 fn get_task_result(
 &self,
 request: GetTaskResultParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<TaskResult, McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<GetTaskPayloadResult, McpError>> + Send + '_ {
 (**self).get_task_result(request, context)
 }

 fn cancel_task(
 &self,
 request: CancelTaskParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<(), McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<CancelTaskResult, McpError>> + Send + '_ {
 (**self).cancel_task(request, context)
 }
 }
Expand Down

16 changes: 6 additions & 10 deletions
crates/rmcp/src/model.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2537,14 +2537,9 @@ impl RequestParamsMeta for CancelTaskParams {
/// Deprecated: Use [`CancelTaskParams`] instead (SEP-1319 compliance).
#[deprecated(since = "0.13.0", note = "Use CancelTaskParams instead")]
pub type CancelTaskParam = CancelTaskParams;
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[serde(rename_all = "camelCase")]
#[serde(deny_unknown_fields)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct GetTaskInfoResult {
 #[serde(skip_serializing_if = "Option::is_none")]
 pub task: Option<crate::model::Task>,
}
/// Deprecated: Use [`GetTaskResult`] instead (spec alignment).
#[deprecated(since = "0.15.0", note = "Use GetTaskResult instead")]
pub type GetTaskInfoResult = GetTaskResult;

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Default)]
#[serde(rename_all = "camelCase")]
Expand DownExpand Up@@ -2720,9 +2715,10 @@ ts_union!(
 | EmptyResult
 | CreateTaskResult
 | ListTasksResult
 | GetTaskInfoResult
 | TaskResult
 | GetTaskResult
 | CancelTaskResult
 | CustomResult
 | GetTaskPayloadResult
 ;
);

Expand Down

61 changes: 44 additions & 17 deletions
crates/rmcp/src/model/task.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
use serde::{Deserialize, Serialize};
use serde_json::Value;

use super::Meta;

/// Canonical task lifecycle status as defined by SEP-1686.
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
#[serde(rename_all = "snake_case")]
Expand All@@ -19,21 +21,10 @@ pub enum TaskStatus {
 Cancelled,
}

/// Final result for a succeeded task (returned from `tasks/result`).
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct TaskResult {
 /// MIME type or custom content-type identifier.
 pub content_type: String,
 /// The actual result payload, matching the underlying request's schema.
 pub value: Value,
 /// Optional short summary for UI surfaces.
 #[serde(skip_serializing_if = "Option::is_none")]
 pub summary: Option<String>,
}

/// Primary Task object that surfaces metadata during the task lifecycle.
///
/// Per spec, `lastUpdatedAt` and `ttl` are required fields.
/// `ttl` is nullable (`null` means unlimited retention).
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Default)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
Expand All@@ -48,10 +39,9 @@ pub struct Task {
 /// ISO-8601 creation timestamp.
 pub created_at: String,
 /// ISO-8601 timestamp for the most recent status change.
 #[serde(skip_serializing_if = "Option::is_none")]
 pub last_updated_at: Option<String>,
 pub last_updated_at: String,
 /// Retention window in milliseconds that the receiver agreed to honor.
#[serde(skip_serializing_if = "Option::is_none")]
/// `None` (serialized as `null`) means unlimited retention.
 pub ttl: Option<u64>,
 /// Suggested polling interval (milliseconds).
 #[serde(skip_serializing_if = "Option::is_none")]
Expand All@@ -66,6 +56,43 @@ pub struct CreateTaskResult {
 pub task: Task,
}

/// Response to a `tasks/get` request.
///
/// Per spec, `GetTaskResult = allOf[Result, Task]` — the Task fields are
/// flattened at the top level, not nested under a `task` key.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct GetTaskResult {
 #[serde(rename = "_meta", default, skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,
 #[serde(flatten)]
 pub task: Task,
}

/// Response to a `tasks/result` request.
///
/// Per spec, the result structure matches the original request type
/// (e.g., `CallToolResult` for `tools/call`). This is represented as
/// an open object. The payload is the original request's result
/// serialized as a JSON value.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct GetTaskPayloadResult(pub Value);

/// Response to a `tasks/cancel` request.
///
/// Per spec, `CancelTaskResult = allOf[Result, Task]` — same shape as `GetTaskResult`.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct CancelTaskResult {
 #[serde(rename = "_meta", default, skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,
 #[serde(flatten)]
 pub task: Task,
}

/// Paginated list of tasks
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
Expand Down
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
Align task response types with MCP spec#658

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

alexhancock
merged 1 commit into

from

Feb 13, 2026
 Merged


Align task response types with MCP spec
#658
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


39 changes: 23 additions & 16 deletions
crates/rmcp-macros/src/task_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 status: rmcp::model::TaskStatus::Working,
 status_message: None,
 created_at: timestamp.clone(),
 last_updated_at: Some(timestamp),
 last_updated_at: timestamp,
 ttl: None,
 poll_interval: None,
 }
Expand DownExpand Up@@ -111,7 +111,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 status: rmcp::model::TaskStatus::Working,
 status_message: Some("Task accepted".to_string()),
 created_at: timestamp.clone(),
 last_updated_at: Some(timestamp),
 last_updated_at: timestamp,
 ttl: None,
 poll_interval: None,
 };
Expand All@@ -128,7 +128,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 &self,
 request: rmcp::model::GetTaskInfoParam,
 _context: rmcp::service::RequestContext<rmcp::RoleServer>,
 ) -> Result<rmcp::model::GetTaskInfoResult, McpError> {
 ) -> Result<rmcp::model::GetTaskResult, McpError> {
 use rmcp::task_manager::current_timestamp;
 let task_id = request.task_id.clone();
 let mut processor = (#processor).lock().await;
Expand DownExpand Up@@ -156,11 +156,11 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 status,
 status_message: None,
 created_at: timestamp.clone(),
 last_updated_at: Some(timestamp),
 last_updated_at: timestamp,
 ttl: completed_result.descriptor.ttl,
 poll_interval: None,
 };
 return Ok(rmcp::model::GetTaskInfoResult { task: Some(task) });
 return Ok(rmcp::model::GetTaskResult { meta: None, task });
 }

 // If not completed, check running
Expand All@@ -172,14 +172,14 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 status: rmcp::model::TaskStatus::Working,
 status_message: None,
 created_at: timestamp.clone(),
 last_updated_at: Some(timestamp),
 last_updated_at: timestamp,
 ttl: None,
 poll_interval: None,
 };
 return Ok(rmcp::model::GetTaskInfoResult { task: Some(task) });
 return Ok(rmcp::model::GetTaskResult { meta: None, task });
 }

Ok(rmcp::model::GetTaskInfoResult { task: None })
Err(McpError::resource_not_found(format!("task not found: {}", task_id), None))
 }
 };
 item_impl.items.push(syn::parse2::<ImplItem>(get_info_fn)?);
Expand All@@ -191,7 +191,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 &self,
 request: rmcp::model::GetTaskResultParam,
 _context: rmcp::service::RequestContext<rmcp::RoleServer>,
 ) -> Result<rmcp::model::TaskResult, McpError> {
 ) -> Result<rmcp::model::GetTaskPayloadResult, McpError> {
 use std::time::Duration;
 let task_id = request.task_id.clone();

Expand All@@ -207,11 +207,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 match &tool.result {
 Ok(call_tool) => {
 let value = ::serde_json::to_value(call_tool).unwrap_or(::serde_json::Value::Null);
 return Ok(rmcp::model::TaskResult {
 content_type: "application/json".to_string(),
 value,
 summary: None,
 });
 return Ok(rmcp::model::GetTaskPayloadResult(value));
 }
 Err(err) => return Err(McpError::internal_error(
 format!("task failed: {}", err),
Expand DownExpand Up@@ -251,12 +247,23 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 &self,
 request: rmcp::model::CancelTaskParam,
 _context: rmcp::service::RequestContext<rmcp::RoleServer>,
 ) -> Result<(), McpError> {
 ) -> Result<rmcp::model::CancelTaskResult, McpError> {
 use rmcp::task_manager::current_timestamp;
 let task_id = request.task_id;
 let mut processor = (#processor).lock().await;

 if processor.cancel_task(&task_id) {
 return Ok(());
 let timestamp = current_timestamp();
 let task = rmcp::model::Task {
 task_id,
 status: rmcp::model::TaskStatus::Cancelled,
 status_message: None,
 created_at: timestamp.clone(),
 last_updated_at: timestamp,
 ttl: None,
 poll_interval: None,
 };
 return Ok(rmcp::model::CancelTaskResult { meta: None, task });
 }

 // If already completed, signal it's not cancellable
Expand Down

19 changes: 10 additions & 9 deletions
crates/rmcp/src/handler/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -116,15 +116,15 @@ impl<H: ServerHandler> Service<RoleServer> for H {
 ClientRequest::GetTaskInfoRequest(request) => self
 .get_task_info(request.params, context)
 .await
 .map(ServerResult::GetTaskInfoResult),
 .map(ServerResult::GetTaskResult),
 ClientRequest::GetTaskResultRequest(request) => self
 .get_task_result(request.params, context)
 .await
 .map(ServerResult::TaskResult),
 .map(ServerResult::GetTaskPayloadResult),
 ClientRequest::CancelTaskRequest(request) => self
 .cancel_task(request.params, context)
 .await
 .map(ServerResult::empty),
 .map(ServerResult::CancelTaskResult),
 }
 }

Expand DownExpand Up@@ -339,15 +339,16 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
 &self,
 request: GetTaskInfoParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<GetTaskInfoResult, McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<GetTaskResult, McpError>> + Send + '_ {
 let _ = (request, context);
 std::future::ready(Err(McpError::method_not_found::<GetTaskInfoMethod>()))
 }

 fn get_task_result(
 &self,
 request: GetTaskResultParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<TaskResult, McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<GetTaskPayloadResult, McpError>> + Send + '_ {
 let _ = (request, context);
 std::future::ready(Err(McpError::method_not_found::<GetTaskResultMethod>()))
 }
Expand All@@ -356,7 +357,7 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
 &self,
 request: CancelTaskParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<(), McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<CancelTaskResult, McpError>> + Send + '_ {
 let _ = (request, context);
 std::future::ready(Err(McpError::method_not_found::<CancelTaskMethod>()))
 }
Expand DownExpand Up@@ -543,23 +544,23 @@ macro_rules! impl_server_handler_for_wrapper {
 &self,
 request: GetTaskInfoParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<GetTaskInfoResult, McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<GetTaskResult, McpError>> + Send + '_ {
 (**self).get_task_info(request, context)
 }

 fn get_task_result(
 &self,
 request: GetTaskResultParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<TaskResult, McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<GetTaskPayloadResult, McpError>> + Send + '_ {
 (**self).get_task_result(request, context)
 }

 fn cancel_task(
 &self,
 request: CancelTaskParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<(), McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<CancelTaskResult, McpError>> + Send + '_ {
 (**self).cancel_task(request, context)
 }
 }
Expand Down

16 changes: 6 additions & 10 deletions
crates/rmcp/src/model.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2537,14 +2537,9 @@ impl RequestParamsMeta for CancelTaskParams {
/// Deprecated: Use [`CancelTaskParams`] instead (SEP-1319 compliance).
#[deprecated(since = "0.13.0", note = "Use CancelTaskParams instead")]
pub type CancelTaskParam = CancelTaskParams;
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[serde(rename_all = "camelCase")]
#[serde(deny_unknown_fields)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct GetTaskInfoResult {
 #[serde(skip_serializing_if = "Option::is_none")]
 pub task: Option<crate::model::Task>,
}
/// Deprecated: Use [`GetTaskResult`] instead (spec alignment).
#[deprecated(since = "0.15.0", note = "Use GetTaskResult instead")]
pub type GetTaskInfoResult = GetTaskResult;

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Default)]
#[serde(rename_all = "camelCase")]
Expand DownExpand Up@@ -2720,9 +2715,10 @@ ts_union!(
 | EmptyResult
 | CreateTaskResult
 | ListTasksResult
 | GetTaskInfoResult
 | TaskResult
 | GetTaskResult
 | CancelTaskResult
 | CustomResult
 | GetTaskPayloadResult
 ;
);

Expand Down

61 changes: 44 additions & 17 deletions
crates/rmcp/src/model/task.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
use serde::{Deserialize, Serialize};
use serde_json::Value;

use super::Meta;

/// Canonical task lifecycle status as defined by SEP-1686.
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
#[serde(rename_all = "snake_case")]
Expand All@@ -19,21 +21,10 @@ pub enum TaskStatus {
 Cancelled,
}

/// Final result for a succeeded task (returned from `tasks/result`).
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct TaskResult {
 /// MIME type or custom content-type identifier.
 pub content_type: String,
 /// The actual result payload, matching the underlying request's schema.
 pub value: Value,
 /// Optional short summary for UI surfaces.
 #[serde(skip_serializing_if = "Option::is_none")]
 pub summary: Option<String>,
}

/// Primary Task object that surfaces metadata during the task lifecycle.
///
/// Per spec, `lastUpdatedAt` and `ttl` are required fields.
/// `ttl` is nullable (`null` means unlimited retention).
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Default)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
Expand All@@ -48,10 +39,9 @@ pub struct Task {
 /// ISO-8601 creation timestamp.
 pub created_at: String,
 /// ISO-8601 timestamp for the most recent status change.
 #[serde(skip_serializing_if = "Option::is_none")]
 pub last_updated_at: Option<String>,
 pub last_updated_at: String,
 /// Retention window in milliseconds that the receiver agreed to honor.
#[serde(skip_serializing_if = "Option::is_none")]
/// `None` (serialized as `null`) means unlimited retention.
 pub ttl: Option<u64>,
 /// Suggested polling interval (milliseconds).
 #[serde(skip_serializing_if = "Option::is_none")]
Expand All@@ -66,6 +56,43 @@ pub struct CreateTaskResult {
 pub task: Task,
}

/// Response to a `tasks/get` request.
///
/// Per spec, `GetTaskResult = allOf[Result, Task]` — the Task fields are
/// flattened at the top level, not nested under a `task` key.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct GetTaskResult {
 #[serde(rename = "_meta", default, skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,
 #[serde(flatten)]
 pub task: Task,
}

/// Response to a `tasks/result` request.
///
/// Per spec, the result structure matches the original request type
/// (e.g., `CallToolResult` for `tools/call`). This is represented as
/// an open object. The payload is the original request's result
/// serialized as a JSON value.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct GetTaskPayloadResult(pub Value);

/// Response to a `tasks/cancel` request.
///
/// Per spec, `CancelTaskResult = allOf[Result, Task]` — same shape as `GetTaskResult`.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct CancelTaskResult {
 #[serde(rename = "_meta", default, skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,
 #[serde(flatten)]
 pub task: Task,
}

/// Paginated list of tasks
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
Expand Down
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
Align task response types with MCP spec#658

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

alexhancock
merged 1 commit into

from

Feb 13, 2026
 Merged


Align task response types with MCP spec
#658
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


39 changes: 23 additions & 16 deletions
crates/rmcp-macros/src/task_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 status: rmcp::model::TaskStatus::Working,
 status_message: None,
 created_at: timestamp.clone(),
 last_updated_at: Some(timestamp),
 last_updated_at: timestamp,
 ttl: None,
 poll_interval: None,
 }
Expand DownExpand Up@@ -111,7 +111,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 status: rmcp::model::TaskStatus::Working,
 status_message: Some("Task accepted".to_string()),
 created_at: timestamp.clone(),
 last_updated_at: Some(timestamp),
 last_updated_at: timestamp,
 ttl: None,
 poll_interval: None,
 };
Expand All@@ -128,7 +128,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 &self,
 request: rmcp::model::GetTaskInfoParam,
 _context: rmcp::service::RequestContext<rmcp::RoleServer>,
 ) -> Result<rmcp::model::GetTaskInfoResult, McpError> {
 ) -> Result<rmcp::model::GetTaskResult, McpError> {
 use rmcp::task_manager::current_timestamp;
 let task_id = request.task_id.clone();
 let mut processor = (#processor).lock().await;
Expand DownExpand Up@@ -156,11 +156,11 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 status,
 status_message: None,
 created_at: timestamp.clone(),
 last_updated_at: Some(timestamp),
 last_updated_at: timestamp,
 ttl: completed_result.descriptor.ttl,
 poll_interval: None,
 };
 return Ok(rmcp::model::GetTaskInfoResult { task: Some(task) });
 return Ok(rmcp::model::GetTaskResult { meta: None, task });
 }

 // If not completed, check running
Expand All@@ -172,14 +172,14 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 status: rmcp::model::TaskStatus::Working,
 status_message: None,
 created_at: timestamp.clone(),
 last_updated_at: Some(timestamp),
 last_updated_at: timestamp,
 ttl: None,
 poll_interval: None,
 };
 return Ok(rmcp::model::GetTaskInfoResult { task: Some(task) });
 return Ok(rmcp::model::GetTaskResult { meta: None, task });
 }

Ok(rmcp::model::GetTaskInfoResult { task: None })
Err(McpError::resource_not_found(format!("task not found: {}", task_id), None))
 }
 };
 item_impl.items.push(syn::parse2::<ImplItem>(get_info_fn)?);
Expand All@@ -191,7 +191,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 &self,
 request: rmcp::model::GetTaskResultParam,
 _context: rmcp::service::RequestContext<rmcp::RoleServer>,
 ) -> Result<rmcp::model::TaskResult, McpError> {
 ) -> Result<rmcp::model::GetTaskPayloadResult, McpError> {
 use std::time::Duration;
 let task_id = request.task_id.clone();

Expand All@@ -207,11 +207,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 match &tool.result {
 Ok(call_tool) => {
 let value = ::serde_json::to_value(call_tool).unwrap_or(::serde_json::Value::Null);
 return Ok(rmcp::model::TaskResult {
 content_type: "application/json".to_string(),
 value,
 summary: None,
 });
 return Ok(rmcp::model::GetTaskPayloadResult(value));
 }
 Err(err) => return Err(McpError::internal_error(
 format!("task failed: {}", err),
Expand DownExpand Up@@ -251,12 +247,23 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 &self,
 request: rmcp::model::CancelTaskParam,
 _context: rmcp::service::RequestContext<rmcp::RoleServer>,
 ) -> Result<(), McpError> {
 ) -> Result<rmcp::model::CancelTaskResult, McpError> {
 use rmcp::task_manager::current_timestamp;
 let task_id = request.task_id;
 let mut processor = (#processor).lock().await;

 if processor.cancel_task(&task_id) {
 return Ok(());
 let timestamp = current_timestamp();
 let task = rmcp::model::Task {
 task_id,
 status: rmcp::model::TaskStatus::Cancelled,
 status_message: None,
 created_at: timestamp.clone(),
 last_updated_at: timestamp,
 ttl: None,
 poll_interval: None,
 };
 return Ok(rmcp::model::CancelTaskResult { meta: None, task });
 }

 // If already completed, signal it's not cancellable
Expand Down

19 changes: 10 additions & 9 deletions
crates/rmcp/src/handler/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -116,15 +116,15 @@ impl<H: ServerHandler> Service<RoleServer> for H {
 ClientRequest::GetTaskInfoRequest(request) => self
 .get_task_info(request.params, context)
 .await
 .map(ServerResult::GetTaskInfoResult),
 .map(ServerResult::GetTaskResult),
 ClientRequest::GetTaskResultRequest(request) => self
 .get_task_result(request.params, context)
 .await
 .map(ServerResult::TaskResult),
 .map(ServerResult::GetTaskPayloadResult),
 ClientRequest::CancelTaskRequest(request) => self
 .cancel_task(request.params, context)
 .await
 .map(ServerResult::empty),
 .map(ServerResult::CancelTaskResult),
 }
 }

Expand DownExpand Up@@ -339,15 +339,16 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
 &self,
 request: GetTaskInfoParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<GetTaskInfoResult, McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<GetTaskResult, McpError>> + Send + '_ {
 let _ = (request, context);
 std::future::ready(Err(McpError::method_not_found::<GetTaskInfoMethod>()))
 }

 fn get_task_result(
 &self,
 request: GetTaskResultParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<TaskResult, McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<GetTaskPayloadResult, McpError>> + Send + '_ {
 let _ = (request, context);
 std::future::ready(Err(McpError::method_not_found::<GetTaskResultMethod>()))
 }
Expand All@@ -356,7 +357,7 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
 &self,
 request: CancelTaskParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<(), McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<CancelTaskResult, McpError>> + Send + '_ {
 let _ = (request, context);
 std::future::ready(Err(McpError::method_not_found::<CancelTaskMethod>()))
 }
Expand DownExpand Up@@ -543,23 +544,23 @@ macro_rules! impl_server_handler_for_wrapper {
 &self,
 request: GetTaskInfoParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<GetTaskInfoResult, McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<GetTaskResult, McpError>> + Send + '_ {
 (**self).get_task_info(request, context)
 }

 fn get_task_result(
 &self,
 request: GetTaskResultParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<TaskResult, McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<GetTaskPayloadResult, McpError>> + Send + '_ {
 (**self).get_task_result(request, context)
 }

 fn cancel_task(
 &self,
 request: CancelTaskParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<(), McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<CancelTaskResult, McpError>> + Send + '_ {
 (**self).cancel_task(request, context)
 }
 }
Expand Down

16 changes: 6 additions & 10 deletions
crates/rmcp/src/model.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2537,14 +2537,9 @@ impl RequestParamsMeta for CancelTaskParams {
/// Deprecated: Use [`CancelTaskParams`] instead (SEP-1319 compliance).
#[deprecated(since = "0.13.0", note = "Use CancelTaskParams instead")]
pub type CancelTaskParam = CancelTaskParams;
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[serde(rename_all = "camelCase")]
#[serde(deny_unknown_fields)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct GetTaskInfoResult {
 #[serde(skip_serializing_if = "Option::is_none")]
 pub task: Option<crate::model::Task>,
}
/// Deprecated: Use [`GetTaskResult`] instead (spec alignment).
#[deprecated(since = "0.15.0", note = "Use GetTaskResult instead")]
pub type GetTaskInfoResult = GetTaskResult;

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Default)]
#[serde(rename_all = "camelCase")]
Expand DownExpand Up@@ -2720,9 +2715,10 @@ ts_union!(
 | EmptyResult
 | CreateTaskResult
 | ListTasksResult
 | GetTaskInfoResult
 | TaskResult
 | GetTaskResult
 | CancelTaskResult
 | CustomResult
 | GetTaskPayloadResult
 ;
);

Expand Down

61 changes: 44 additions & 17 deletions
crates/rmcp/src/model/task.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
use serde::{Deserialize, Serialize};
use serde_json::Value;

use super::Meta;

/// Canonical task lifecycle status as defined by SEP-1686.
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
#[serde(rename_all = "snake_case")]
Expand All@@ -19,21 +21,10 @@ pub enum TaskStatus {
 Cancelled,
}

/// Final result for a succeeded task (returned from `tasks/result`).
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct TaskResult {
 /// MIME type or custom content-type identifier.
 pub content_type: String,
 /// The actual result payload, matching the underlying request's schema.
 pub value: Value,
 /// Optional short summary for UI surfaces.
 #[serde(skip_serializing_if = "Option::is_none")]
 pub summary: Option<String>,
}

/// Primary Task object that surfaces metadata during the task lifecycle.
///
/// Per spec, `lastUpdatedAt` and `ttl` are required fields.
/// `ttl` is nullable (`null` means unlimited retention).
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Default)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
Expand All@@ -48,10 +39,9 @@ pub struct Task {
 /// ISO-8601 creation timestamp.
 pub created_at: String,
 /// ISO-8601 timestamp for the most recent status change.
 #[serde(skip_serializing_if = "Option::is_none")]
 pub last_updated_at: Option<String>,
 pub last_updated_at: String,
 /// Retention window in milliseconds that the receiver agreed to honor.
#[serde(skip_serializing_if = "Option::is_none")]
/// `None` (serialized as `null`) means unlimited retention.
 pub ttl: Option<u64>,
 /// Suggested polling interval (milliseconds).
 #[serde(skip_serializing_if = "Option::is_none")]
Expand All@@ -66,6 +56,43 @@ pub struct CreateTaskResult {
 pub task: Task,
}

/// Response to a `tasks/get` request.
///
/// Per spec, `GetTaskResult = allOf[Result, Task]` — the Task fields are
/// flattened at the top level, not nested under a `task` key.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct GetTaskResult {
 #[serde(rename = "_meta", default, skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,
 #[serde(flatten)]
 pub task: Task,
}

/// Response to a `tasks/result` request.
///
/// Per spec, the result structure matches the original request type
/// (e.g., `CallToolResult` for `tools/call`). This is represented as
/// an open object. The payload is the original request's result
/// serialized as a JSON value.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct GetTaskPayloadResult(pub Value);

/// Response to a `tasks/cancel` request.
///
/// Per spec, `CancelTaskResult = allOf[Result, Task]` — same shape as `GetTaskResult`.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct CancelTaskResult {
 #[serde(rename = "_meta", default, skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,
 #[serde(flatten)]
 pub task: Task,
}

/// Paginated list of tasks
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
Expand Down
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
Align task response types with MCP spec#658

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

alexhancock
merged 1 commit into

from

Feb 13, 2026
 Merged


Align task response types with MCP spec
#658
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


39 changes: 23 additions & 16 deletions
crates/rmcp-macros/src/task_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 status: rmcp::model::TaskStatus::Working,
 status_message: None,
 created_at: timestamp.clone(),
 last_updated_at: Some(timestamp),
 last_updated_at: timestamp,
 ttl: None,
 poll_interval: None,
 }
Expand DownExpand Up@@ -111,7 +111,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 status: rmcp::model::TaskStatus::Working,
 status_message: Some("Task accepted".to_string()),
 created_at: timestamp.clone(),
 last_updated_at: Some(timestamp),
 last_updated_at: timestamp,
 ttl: None,
 poll_interval: None,
 };
Expand All@@ -128,7 +128,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 &self,
 request: rmcp::model::GetTaskInfoParam,
 _context: rmcp::service::RequestContext<rmcp::RoleServer>,
 ) -> Result<rmcp::model::GetTaskInfoResult, McpError> {
 ) -> Result<rmcp::model::GetTaskResult, McpError> {
 use rmcp::task_manager::current_timestamp;
 let task_id = request.task_id.clone();
 let mut processor = (#processor).lock().await;
Expand DownExpand Up@@ -156,11 +156,11 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 status,
 status_message: None,
 created_at: timestamp.clone(),
 last_updated_at: Some(timestamp),
 last_updated_at: timestamp,
 ttl: completed_result.descriptor.ttl,
 poll_interval: None,
 };
 return Ok(rmcp::model::GetTaskInfoResult { task: Some(task) });
 return Ok(rmcp::model::GetTaskResult { meta: None, task });
 }

 // If not completed, check running
Expand All@@ -172,14 +172,14 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 status: rmcp::model::TaskStatus::Working,
 status_message: None,
 created_at: timestamp.clone(),
 last_updated_at: Some(timestamp),
 last_updated_at: timestamp,
 ttl: None,
 poll_interval: None,
 };
 return Ok(rmcp::model::GetTaskInfoResult { task: Some(task) });
 return Ok(rmcp::model::GetTaskResult { meta: None, task });
 }

Ok(rmcp::model::GetTaskInfoResult { task: None })
Err(McpError::resource_not_found(format!("task not found: {}", task_id), None))
 }
 };
 item_impl.items.push(syn::parse2::<ImplItem>(get_info_fn)?);
Expand All@@ -191,7 +191,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 &self,
 request: rmcp::model::GetTaskResultParam,
 _context: rmcp::service::RequestContext<rmcp::RoleServer>,
 ) -> Result<rmcp::model::TaskResult, McpError> {
 ) -> Result<rmcp::model::GetTaskPayloadResult, McpError> {
 use std::time::Duration;
 let task_id = request.task_id.clone();

Expand All@@ -207,11 +207,7 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 match &tool.result {
 Ok(call_tool) => {
 let value = ::serde_json::to_value(call_tool).unwrap_or(::serde_json::Value::Null);
 return Ok(rmcp::model::TaskResult {
 content_type: "application/json".to_string(),
 value,
 summary: None,
 });
 return Ok(rmcp::model::GetTaskPayloadResult(value));
 }
 Err(err) => return Err(McpError::internal_error(
 format!("task failed: {}", err),
Expand DownExpand Up@@ -251,12 +247,23 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 &self,
 request: rmcp::model::CancelTaskParam,
 _context: rmcp::service::RequestContext<rmcp::RoleServer>,
 ) -> Result<(), McpError> {
 ) -> Result<rmcp::model::CancelTaskResult, McpError> {
 use rmcp::task_manager::current_timestamp;
 let task_id = request.task_id;
 let mut processor = (#processor).lock().await;

 if processor.cancel_task(&task_id) {
 return Ok(());
 let timestamp = current_timestamp();
 let task = rmcp::model::Task {
 task_id,
 status: rmcp::model::TaskStatus::Cancelled,
 status_message: None,
 created_at: timestamp.clone(),
 last_updated_at: timestamp,
 ttl: None,
 poll_interval: None,
 };
 return Ok(rmcp::model::CancelTaskResult { meta: None, task });
 }

 // If already completed, signal it's not cancellable
Expand Down

19 changes: 10 additions & 9 deletions
crates/rmcp/src/handler/server.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -116,15 +116,15 @@ impl<H: ServerHandler> Service<RoleServer> for H {
 ClientRequest::GetTaskInfoRequest(request) => self
 .get_task_info(request.params, context)
 .await
 .map(ServerResult::GetTaskInfoResult),
 .map(ServerResult::GetTaskResult),
 ClientRequest::GetTaskResultRequest(request) => self
 .get_task_result(request.params, context)
 .await
 .map(ServerResult::TaskResult),
 .map(ServerResult::GetTaskPayloadResult),
 ClientRequest::CancelTaskRequest(request) => self
 .cancel_task(request.params, context)
 .await
 .map(ServerResult::empty),
 .map(ServerResult::CancelTaskResult),
 }
 }

Expand DownExpand Up@@ -339,15 +339,16 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
 &self,
 request: GetTaskInfoParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<GetTaskInfoResult, McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<GetTaskResult, McpError>> + Send + '_ {
 let _ = (request, context);
 std::future::ready(Err(McpError::method_not_found::<GetTaskInfoMethod>()))
 }

 fn get_task_result(
 &self,
 request: GetTaskResultParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<TaskResult, McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<GetTaskPayloadResult, McpError>> + Send + '_ {
 let _ = (request, context);
 std::future::ready(Err(McpError::method_not_found::<GetTaskResultMethod>()))
 }
Expand All@@ -356,7 +357,7 @@ pub trait ServerHandler: Sized + Send + Sync + 'static {
 &self,
 request: CancelTaskParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<(), McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<CancelTaskResult, McpError>> + Send + '_ {
 let _ = (request, context);
 std::future::ready(Err(McpError::method_not_found::<CancelTaskMethod>()))
 }
Expand DownExpand Up@@ -543,23 +544,23 @@ macro_rules! impl_server_handler_for_wrapper {
 &self,
 request: GetTaskInfoParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<GetTaskInfoResult, McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<GetTaskResult, McpError>> + Send + '_ {
 (**self).get_task_info(request, context)
 }

 fn get_task_result(
 &self,
 request: GetTaskResultParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<TaskResult, McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<GetTaskPayloadResult, McpError>> + Send + '_ {
 (**self).get_task_result(request, context)
 }

 fn cancel_task(
 &self,
 request: CancelTaskParams,
 context: RequestContext<RoleServer>,
 ) -> impl Future<Output = Result<(), McpError>> + Send + '_ {
 ) -> impl Future<Output = Result<CancelTaskResult, McpError>> + Send + '_ {
 (**self).cancel_task(request, context)
 }
 }
Expand Down

16 changes: 6 additions & 10 deletions
crates/rmcp/src/model.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2537,14 +2537,9 @@ impl RequestParamsMeta for CancelTaskParams {
/// Deprecated: Use [`CancelTaskParams`] instead (SEP-1319 compliance).
#[deprecated(since = "0.13.0", note = "Use CancelTaskParams instead")]
pub type CancelTaskParam = CancelTaskParams;
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[serde(rename_all = "camelCase")]
#[serde(deny_unknown_fields)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct GetTaskInfoResult {
 #[serde(skip_serializing_if = "Option::is_none")]
 pub task: Option<crate::model::Task>,
}
/// Deprecated: Use [`GetTaskResult`] instead (spec alignment).
#[deprecated(since = "0.15.0", note = "Use GetTaskResult instead")]
pub type GetTaskInfoResult = GetTaskResult;

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Default)]
#[serde(rename_all = "camelCase")]
Expand DownExpand Up@@ -2720,9 +2715,10 @@ ts_union!(
 | EmptyResult
 | CreateTaskResult
 | ListTasksResult
 | GetTaskInfoResult
 | TaskResult
 | GetTaskResult
 | CancelTaskResult
 | CustomResult
 | GetTaskPayloadResult
 ;
);

Expand Down

61 changes: 44 additions & 17 deletions
crates/rmcp/src/model/task.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
use serde::{Deserialize, Serialize};
use serde_json::Value;

use super::Meta;

/// Canonical task lifecycle status as defined by SEP-1686.
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
#[serde(rename_all = "snake_case")]
Expand All@@ -19,21 +21,10 @@ pub enum TaskStatus {
 Cancelled,
}

/// Final result for a succeeded task (returned from `tasks/result`).
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct TaskResult {
 /// MIME type or custom content-type identifier.
 pub content_type: String,
 /// The actual result payload, matching the underlying request's schema.
 pub value: Value,
 /// Optional short summary for UI surfaces.
 #[serde(skip_serializing_if = "Option::is_none")]
 pub summary: Option<String>,
}

/// Primary Task object that surfaces metadata during the task lifecycle.
///
/// Per spec, `lastUpdatedAt` and `ttl` are required fields.
/// `ttl` is nullable (`null` means unlimited retention).
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Default)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
Expand All@@ -48,10 +39,9 @@ pub struct Task {
 /// ISO-8601 creation timestamp.
 pub created_at: String,
 /// ISO-8601 timestamp for the most recent status change.
 #[serde(skip_serializing_if = "Option::is_none")]
 pub last_updated_at: Option<String>,
 pub last_updated_at: String,
 /// Retention window in milliseconds that the receiver agreed to honor.
#[serde(skip_serializing_if = "Option::is_none")]
/// `None` (serialized as `null`) means unlimited retention.
 pub ttl: Option<u64>,
 /// Suggested polling interval (milliseconds).
 #[serde(skip_serializing_if = "Option::is_none")]
Expand All@@ -66,6 +56,43 @@ pub struct CreateTaskResult {
 pub task: Task,
}

/// Response to a `tasks/get` request.
///
/// Per spec, `GetTaskResult = allOf[Result, Task]` — the Task fields are
/// flattened at the top level, not nested under a `task` key.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct GetTaskResult {
 #[serde(rename = "_meta", default, skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,
 #[serde(flatten)]
 pub task: Task,
}

/// Response to a `tasks/result` request.
///
/// Per spec, the result structure matches the original request type
/// (e.g., `CallToolResult` for `tools/call`). This is represented as
/// an open object. The payload is the original request's result
/// serialized as a JSON value.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct GetTaskPayloadResult(pub Value);

/// Response to a `tasks/cancel` request.
///
/// Per spec, `CancelTaskResult = allOf[Result, Task]` — same shape as `GetTaskResult`.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct CancelTaskResult {
 #[serde(rename = "_meta", default, skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,
 #[serde(flatten)]
 pub task: Task,
}

/// Paginated list of tasks
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
Expand Down
Loading