Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 8 additions & 22 deletions crates/rmcp-macros/src/task_handler.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -223,38 +223,24 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
.push(syn::parse2::<ImplItem>(get_result_fn)?);
}

if !has_method("cancel_task", &item_impl) {
let cancel_fn = quote! {
async fn cancel_task(
if !has_method("delete_task", &item_impl) {
let delete_fn = quote! {
async fn delete_task(
&self,
request: rmcp::model::CancelTaskParams,
request: rmcp::model::DeleteTaskParams,
_context: rmcp::service::RequestContext<rmcp::RoleServer>,
) -> Result<rmcp::model::CancelTaskResult, McpError> {
use rmcp::task_manager::current_timestamp;
) -> Result<rmcp::model::DeleteTaskResult, McpError> {
let task_id = request.task_id;
let mut processor = (#processor).lock().await;

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

// If already completed, signal it's not cancellable
let exists_completed = processor.peek_completed().iter().any(|r| r.descriptor.operation_id == task_id);
if exists_completed {
return Err(McpError::invalid_request(format!("task already completed: {}", task_id), None));
if processor.delete_task(&task_id) {
return Ok(rmcp::model::DeleteTaskResult { meta: None });
}

Err(McpError::resource_not_found(format!("task not found: {}", task_id), None))
}
};
item_impl.items.push(syn::parse2::<ImplItem>(cancel_fn)?);
item_impl.items.push(syn::parse2::<ImplItem>(delete_fn)?);
}

// Auto-generate get_info() if not already provided and no sibling tool/prompt handler
Expand Down
15 changes: 15 additions & 0 deletions crates/rmcp/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,16 @@ features = [
]
rustdoc-args = ["--cfg", "docsrs"]

# The protocol message unions in `model.rs` (`ClientRequest`, `ServerRequest`,
# `ClientResult`, `ServerResult`, …) are generated by `ts_union!` and are
# intentionally `#[non_exhaustive]`-free (see the `clippy::exhaustive_enums`
# expectation on the macro): each new spec revision adds message variants.
# Adding a variant is non-breaking for downstream consumers — the enums are
# `#[serde(untagged)]` and gain `From` impls — so `enum_variant_added` is
# expected churn rather than a true semver break.
[package.metadata.cargo-semver-checks.lints]
enum_variant_added = "allow"

[dependencies]
async-trait = "0.1.89"
serde = { version = "1.0", features = ["derive", "rc"] }
Expand DownExpand Up@@ -293,6 +303,11 @@ name = "test_custom_request"
required-features = ["server", "client"]
path = "tests/test_custom_request.rs"

[[test]]
name = "test_task_client_receiver"
required-features = ["server", "client"]
path = "tests/test_task_client_receiver.rs"

[[test]]
name = "test_prompt_macros"
required-features = ["server", "client"]
Expand Down
110 changes: 110 additions & 0 deletions crates/rmcp/src/handler/client.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,22 @@ impl<H: ClientHandler> Service<RoleClient> for H {
.create_elicitation(request.params, context)
.await
.map(ClientResult::CreateElicitationResult),
ServerRequest::ListTasksRequest(request) => self
.list_tasks(request.params, context)
.await
.map(ClientResult::ListTasksResult),
ServerRequest::GetTaskInfoRequest(request) => self
.get_task_info(request.params, context)
.await
.map(ClientResult::GetTaskResult),
ServerRequest::GetTaskResultRequest(request) => self
.get_task_result(request.params, context)
.await
.map(ClientResult::GetTaskPayloadResult),
ServerRequest::DeleteTaskRequest(request) => self
.delete_task(request.params, context)
.await
.map(ClientResult::DeleteTaskResult),
ServerRequest::CustomRequest(request) => self
.on_custom_request(request, context)
.await
Expand DownExpand Up@@ -191,6 +207,68 @@ pub trait ClientHandler: Sized + Send + Sync + 'static {
)))
}

/// Handle a `tasks/list` request from a server. Only relevant when the
/// client is also a task *receiver* (e.g. it accepted a task-augmented
/// `sampling/createMessage` or `elicitation/create` request).
///
/// # Default Behavior
/// Returns `-32601` (Method not found). Clients that advertise
/// `capabilities.tasks.list` must override this.
fn list_tasks(
&self,
request: Option<PaginatedRequestParams>,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<ListTasksResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<ListTasksMethod>()))
}

/// Handle a `tasks/get` request from a server. Only relevant when the
/// client is also a task *receiver* (e.g. it accepted a task-augmented
/// `sampling/createMessage` or `elicitation/create` request).
///
/// # Default Behavior
/// Returns `-32601` (Method not found). Clients that advertise
/// `capabilities.tasks.requests.sampling.createMessage` or
/// `capabilities.tasks.requests.elicitation.create` must override this.
fn get_task_info(
&self,
request: GetTaskInfoParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<GetTaskResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<GetTaskInfoMethod>()))
}

/// Handle a `tasks/result` request from a server. Only relevant when
/// the client is also a task *receiver*.
///
/// # Default Behavior
/// Returns `-32601` (Method not found).
fn get_task_result(
&self,
request: GetTaskResultParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<GetTaskPayloadResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<GetTaskResultMethod>()))
}

/// Handle a `tasks/delete` request from a server (SEP-1686 §3.6).
/// Only relevant when the client is also a task *receiver*.
///
/// # Default Behavior
/// Returns `-32601` (Method not found). Task receivers must override this
/// to delete the task and any associated stored result.
fn delete_task(
&self,
request: DeleteTaskParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<DeleteTaskMethod>()))
}

fn on_cancelled(
&self,
params: CancelledNotificationParam,
Expand DownExpand Up@@ -310,6 +388,38 @@ macro_rules! impl_client_handler_for_wrapper {
(**self).on_custom_request(request, context)
}

fn list_tasks(
&self,
request: Option<PaginatedRequestParams>,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<ListTasksResult, McpError>> + MaybeSendFuture + '_ {
(**self).list_tasks(request, context)
}

fn get_task_info(
&self,
request: GetTaskInfoParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<GetTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).get_task_info(request, context)
}

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

fn delete_task(
&self,
request: DeleteTaskParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).delete_task(request, context)
}

fn on_cancelled(
&self,
params: CancelledNotificationParam,
Expand Down
22 changes: 11 additions & 11 deletions crates/rmcp/src/handler/server.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,10 +125,10 @@ impl<H: ServerHandler> Service<RoleServer> for H {
.get_task_result(request.params, context)
.await
.map(ServerResult::GetTaskPayloadResult),
ClientRequest::CancelTaskRequest(request) => self
.cancel_task(request.params, context)
ClientRequest::DeleteTaskRequest(request) => self
.delete_task(request.params, context)
.await
.map(ServerResult::CancelTaskResult),
.map(ServerResult::DeleteTaskResult),
};
// SEP-2164: peers negotiating 2026-07-28+ get the standard INVALID_PARAMS code for
// resource-not-found; older peers keep RESOURCE_NOT_FOUND. ISO `YYYY-MM-DD` versions
Expand DownExpand Up@@ -398,13 +398,13 @@ macro_rules! server_handler_methods {
std::future::ready(Err(McpError::method_not_found::<GetTaskResultMethod>()))
}

fn cancel_task(
fn delete_task(
&self,
request: CancelTaskParams,
request: DeleteTaskParams,
context: RequestContext<RoleServer>,
) -> impl Future<Output = Result<CancelTaskResult, McpError>> + MaybeSendFuture + '_ {
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<CancelTaskMethod>()))
std::future::ready(Err(McpError::method_not_found::<DeleteTaskMethod>()))
}
};
}
Expand DownExpand Up@@ -614,12 +614,12 @@ macro_rules! impl_server_handler_for_wrapper {
(**self).get_task_result(request, context)
}

fn cancel_task(
fn delete_task(
&self,
request: CancelTaskParams,
request: DeleteTaskParams,
context: RequestContext<RoleServer>,
) -> impl Future<Output = Result<CancelTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).cancel_task(request, context)
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).delete_task(request, context)
}
}
};
Expand Down
42 changes: 31 additions & 11 deletions crates/rmcp/src/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -3213,32 +3213,28 @@ impl RequestParamsMeta for GetTaskResultParams {
#[deprecated(since = "0.13.0", note = "Use GetTaskResultParams instead")]
pub type GetTaskResultParam = GetTaskResultParams;

const_string!(CancelTaskMethod = "tasks/cancel");
pub type CancelTaskRequest = Request<CancelTaskMethod, CancelTaskParams>;
const_string!(DeleteTaskMethod = "tasks/delete");
pub type DeleteTaskRequest = Request<DeleteTaskMethod, DeleteTaskParams>;

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct CancelTaskParams {
pub struct DeleteTaskParams {
/// Protocol-level metadata for this request (SEP-1319)
#[serde(rename = "_meta", default, skip_serializing_if = "Option::is_none")]
pub meta: Option<Meta>,
pub task_id: String,
}

impl RequestParamsMeta for CancelTaskParams {
impl RequestParamsMeta for DeleteTaskParams {
fn meta(&self) -> Option<&Meta> {
self.meta.as_ref()
}
fn meta_mut(&mut self) -> &mut Option<Meta> {
&mut self.meta
}
}

/// Deprecated: Use [`CancelTaskParams`] instead (SEP-1319 compliance).
#[deprecated(since = "0.13.0", note = "Use CancelTaskParams instead")]
pub type CancelTaskParam = CancelTaskParams;
/// Deprecated: Use [`GetTaskResult`] instead (spec alignment).
#[deprecated(since = "0.15.0", note = "Use GetTaskResult instead")]
pub type GetTaskInfoResult = GetTaskResult;
Expand DownExpand Up@@ -3338,7 +3334,7 @@ ts_union!(
| GetTaskInfoRequest
| ListTasksRequest
| GetTaskResultRequest
| CancelTaskRequest
| DeleteTaskRequest
| CustomRequest;
);

Expand All@@ -3361,7 +3357,7 @@ impl ClientRequest {
ClientRequest::GetTaskInfoRequest(r) => r.method.as_str(),
ClientRequest::ListTasksRequest(r) => r.method.as_str(),
ClientRequest::GetTaskResultRequest(r) => r.method.as_str(),
ClientRequest::CancelTaskRequest(r) => r.method.as_str(),
ClientRequest::DeleteTaskRequest(r) => r.method.as_str(),
ClientRequest::CustomRequest(r) => r.method.as_str(),
}
}
Expand All@@ -3381,6 +3377,10 @@ ts_union!(
box CreateMessageResult
| ListRootsResult
| CreateElicitationResult
| ListTasksResult
| GetTaskResult
| GetTaskPayloadResult
| DeleteTaskResult
| EmptyResult
| CustomResult;
);
Expand All@@ -3399,9 +3399,29 @@ ts_union!(
| CreateMessageRequest
| ListRootsRequest
| CreateElicitationRequest
| GetTaskInfoRequest
| ListTasksRequest
| GetTaskResultRequest
| DeleteTaskRequest
| CustomRequest;
);

impl ServerRequest {
pub fn method(&self) -> &str {
match &self {
ServerRequest::PingRequest(r) => r.method.as_str(),
ServerRequest::CreateMessageRequest(r) => r.method.as_str(),
ServerRequest::ListRootsRequest(r) => r.method.as_str(),
ServerRequest::CreateElicitationRequest(r) => r.method.as_str(),
ServerRequest::GetTaskInfoRequest(r) => r.method.as_str(),
ServerRequest::ListTasksRequest(r) => r.method.as_str(),
ServerRequest::GetTaskResultRequest(r) => r.method.as_str(),
ServerRequest::DeleteTaskRequest(r) => r.method.as_str(),
ServerRequest::CustomRequest(r) => r.method.as_str(),
}
}
}

ts_union!(
export type ServerNotification =
| CancelledNotification
Expand DownExpand Up@@ -3429,7 +3449,7 @@ ts_union!(
| CreateTaskResult
| ListTasksResult
| GetTaskResult
| CancelTaskResult
| DeleteTaskResult
| CallToolResult
| GetTaskPayloadResult
| EmptyResult
Expand Down
6 changes: 5 additions & 1 deletion crates/rmcp/src/model/meta.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,7 +155,7 @@ variant_extension! {
GetTaskInfoRequest
ListTasksRequest
GetTaskResultRequest
CancelTaskRequest
DeleteTaskRequest
}
}

Expand All@@ -166,6 +166,10 @@ variant_extension! {
ListRootsRequest
CreateElicitationRequest
CustomRequest
GetTaskInfoRequest
ListTasksRequest
GetTaskResultRequest
DeleteTaskRequest
}
}

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} 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
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 8 additions & 22 deletions crates/rmcp-macros/src/task_handler.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -223,38 +223,24 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
.push(syn::parse2::<ImplItem>(get_result_fn)?);
}

if !has_method("cancel_task", &item_impl) {
let cancel_fn = quote! {
async fn cancel_task(
if !has_method("delete_task", &item_impl) {
let delete_fn = quote! {
async fn delete_task(
&self,
request: rmcp::model::CancelTaskParams,
request: rmcp::model::DeleteTaskParams,
_context: rmcp::service::RequestContext<rmcp::RoleServer>,
) -> Result<rmcp::model::CancelTaskResult, McpError> {
use rmcp::task_manager::current_timestamp;
) -> Result<rmcp::model::DeleteTaskResult, McpError> {
let task_id = request.task_id;
let mut processor = (#processor).lock().await;

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

// If already completed, signal it's not cancellable
let exists_completed = processor.peek_completed().iter().any(|r| r.descriptor.operation_id == task_id);
if exists_completed {
return Err(McpError::invalid_request(format!("task already completed: {}", task_id), None));
if processor.delete_task(&task_id) {
return Ok(rmcp::model::DeleteTaskResult { meta: None });
}

Err(McpError::resource_not_found(format!("task not found: {}", task_id), None))
}
};
item_impl.items.push(syn::parse2::<ImplItem>(cancel_fn)?);
item_impl.items.push(syn::parse2::<ImplItem>(delete_fn)?);
}

// Auto-generate get_info() if not already provided and no sibling tool/prompt handler
Expand Down
15 changes: 15 additions & 0 deletions crates/rmcp/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,16 @@ features = [
]
rustdoc-args = ["--cfg", "docsrs"]

# The protocol message unions in `model.rs` (`ClientRequest`, `ServerRequest`,
# `ClientResult`, `ServerResult`, …) are generated by `ts_union!` and are
# intentionally `#[non_exhaustive]`-free (see the `clippy::exhaustive_enums`
# expectation on the macro): each new spec revision adds message variants.
# Adding a variant is non-breaking for downstream consumers — the enums are
# `#[serde(untagged)]` and gain `From` impls — so `enum_variant_added` is
# expected churn rather than a true semver break.
[package.metadata.cargo-semver-checks.lints]
enum_variant_added = "allow"

[dependencies]
async-trait = "0.1.89"
serde = { version = "1.0", features = ["derive", "rc"] }
Expand DownExpand Up@@ -293,6 +303,11 @@ name = "test_custom_request"
required-features = ["server", "client"]
path = "tests/test_custom_request.rs"

[[test]]
name = "test_task_client_receiver"
required-features = ["server", "client"]
path = "tests/test_task_client_receiver.rs"

[[test]]
name = "test_prompt_macros"
required-features = ["server", "client"]
Expand Down
110 changes: 110 additions & 0 deletions crates/rmcp/src/handler/client.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,22 @@ impl<H: ClientHandler> Service<RoleClient> for H {
.create_elicitation(request.params, context)
.await
.map(ClientResult::CreateElicitationResult),
ServerRequest::ListTasksRequest(request) => self
.list_tasks(request.params, context)
.await
.map(ClientResult::ListTasksResult),
ServerRequest::GetTaskInfoRequest(request) => self
.get_task_info(request.params, context)
.await
.map(ClientResult::GetTaskResult),
ServerRequest::GetTaskResultRequest(request) => self
.get_task_result(request.params, context)
.await
.map(ClientResult::GetTaskPayloadResult),
ServerRequest::DeleteTaskRequest(request) => self
.delete_task(request.params, context)
.await
.map(ClientResult::DeleteTaskResult),
ServerRequest::CustomRequest(request) => self
.on_custom_request(request, context)
.await
Expand DownExpand Up@@ -191,6 +207,68 @@ pub trait ClientHandler: Sized + Send + Sync + 'static {
)))
}

/// Handle a `tasks/list` request from a server. Only relevant when the
/// client is also a task *receiver* (e.g. it accepted a task-augmented
/// `sampling/createMessage` or `elicitation/create` request).
///
/// # Default Behavior
/// Returns `-32601` (Method not found). Clients that advertise
/// `capabilities.tasks.list` must override this.
fn list_tasks(
&self,
request: Option<PaginatedRequestParams>,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<ListTasksResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<ListTasksMethod>()))
}

/// Handle a `tasks/get` request from a server. Only relevant when the
/// client is also a task *receiver* (e.g. it accepted a task-augmented
/// `sampling/createMessage` or `elicitation/create` request).
///
/// # Default Behavior
/// Returns `-32601` (Method not found). Clients that advertise
/// `capabilities.tasks.requests.sampling.createMessage` or
/// `capabilities.tasks.requests.elicitation.create` must override this.
fn get_task_info(
&self,
request: GetTaskInfoParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<GetTaskResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<GetTaskInfoMethod>()))
}

/// Handle a `tasks/result` request from a server. Only relevant when
/// the client is also a task *receiver*.
///
/// # Default Behavior
/// Returns `-32601` (Method not found).
fn get_task_result(
&self,
request: GetTaskResultParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<GetTaskPayloadResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<GetTaskResultMethod>()))
}

/// Handle a `tasks/delete` request from a server (SEP-1686 §3.6).
/// Only relevant when the client is also a task *receiver*.
///
/// # Default Behavior
/// Returns `-32601` (Method not found). Task receivers must override this
/// to delete the task and any associated stored result.
fn delete_task(
&self,
request: DeleteTaskParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<DeleteTaskMethod>()))
}

fn on_cancelled(
&self,
params: CancelledNotificationParam,
Expand DownExpand Up@@ -310,6 +388,38 @@ macro_rules! impl_client_handler_for_wrapper {
(**self).on_custom_request(request, context)
}

fn list_tasks(
&self,
request: Option<PaginatedRequestParams>,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<ListTasksResult, McpError>> + MaybeSendFuture + '_ {
(**self).list_tasks(request, context)
}

fn get_task_info(
&self,
request: GetTaskInfoParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<GetTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).get_task_info(request, context)
}

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

fn delete_task(
&self,
request: DeleteTaskParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).delete_task(request, context)
}

fn on_cancelled(
&self,
params: CancelledNotificationParam,
Expand Down
22 changes: 11 additions & 11 deletions crates/rmcp/src/handler/server.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,10 +125,10 @@ impl<H: ServerHandler> Service<RoleServer> for H {
.get_task_result(request.params, context)
.await
.map(ServerResult::GetTaskPayloadResult),
ClientRequest::CancelTaskRequest(request) => self
.cancel_task(request.params, context)
ClientRequest::DeleteTaskRequest(request) => self
.delete_task(request.params, context)
.await
.map(ServerResult::CancelTaskResult),
.map(ServerResult::DeleteTaskResult),
};
// SEP-2164: peers negotiating 2026-07-28+ get the standard INVALID_PARAMS code for
// resource-not-found; older peers keep RESOURCE_NOT_FOUND. ISO `YYYY-MM-DD` versions
Expand DownExpand Up@@ -398,13 +398,13 @@ macro_rules! server_handler_methods {
std::future::ready(Err(McpError::method_not_found::<GetTaskResultMethod>()))
}

fn cancel_task(
fn delete_task(
&self,
request: CancelTaskParams,
request: DeleteTaskParams,
context: RequestContext<RoleServer>,
) -> impl Future<Output = Result<CancelTaskResult, McpError>> + MaybeSendFuture + '_ {
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<CancelTaskMethod>()))
std::future::ready(Err(McpError::method_not_found::<DeleteTaskMethod>()))
}
};
}
Expand DownExpand Up@@ -614,12 +614,12 @@ macro_rules! impl_server_handler_for_wrapper {
(**self).get_task_result(request, context)
}

fn cancel_task(
fn delete_task(
&self,
request: CancelTaskParams,
request: DeleteTaskParams,
context: RequestContext<RoleServer>,
) -> impl Future<Output = Result<CancelTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).cancel_task(request, context)
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).delete_task(request, context)
}
}
};
Expand Down
42 changes: 31 additions & 11 deletions crates/rmcp/src/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -3213,32 +3213,28 @@ impl RequestParamsMeta for GetTaskResultParams {
#[deprecated(since = "0.13.0", note = "Use GetTaskResultParams instead")]
pub type GetTaskResultParam = GetTaskResultParams;

const_string!(CancelTaskMethod = "tasks/cancel");
pub type CancelTaskRequest = Request<CancelTaskMethod, CancelTaskParams>;
const_string!(DeleteTaskMethod = "tasks/delete");
pub type DeleteTaskRequest = Request<DeleteTaskMethod, DeleteTaskParams>;

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct CancelTaskParams {
pub struct DeleteTaskParams {
/// Protocol-level metadata for this request (SEP-1319)
#[serde(rename = "_meta", default, skip_serializing_if = "Option::is_none")]
pub meta: Option<Meta>,
pub task_id: String,
}

impl RequestParamsMeta for CancelTaskParams {
impl RequestParamsMeta for DeleteTaskParams {
fn meta(&self) -> Option<&Meta> {
self.meta.as_ref()
}
fn meta_mut(&mut self) -> &mut Option<Meta> {
&mut self.meta
}
}

/// Deprecated: Use [`CancelTaskParams`] instead (SEP-1319 compliance).
#[deprecated(since = "0.13.0", note = "Use CancelTaskParams instead")]
pub type CancelTaskParam = CancelTaskParams;
/// Deprecated: Use [`GetTaskResult`] instead (spec alignment).
#[deprecated(since = "0.15.0", note = "Use GetTaskResult instead")]
pub type GetTaskInfoResult = GetTaskResult;
Expand DownExpand Up@@ -3338,7 +3334,7 @@ ts_union!(
| GetTaskInfoRequest
| ListTasksRequest
| GetTaskResultRequest
| CancelTaskRequest
| DeleteTaskRequest
| CustomRequest;
);

Expand All@@ -3361,7 +3357,7 @@ impl ClientRequest {
ClientRequest::GetTaskInfoRequest(r) => r.method.as_str(),
ClientRequest::ListTasksRequest(r) => r.method.as_str(),
ClientRequest::GetTaskResultRequest(r) => r.method.as_str(),
ClientRequest::CancelTaskRequest(r) => r.method.as_str(),
ClientRequest::DeleteTaskRequest(r) => r.method.as_str(),
ClientRequest::CustomRequest(r) => r.method.as_str(),
}
}
Expand All@@ -3381,6 +3377,10 @@ ts_union!(
box CreateMessageResult
| ListRootsResult
| CreateElicitationResult
| ListTasksResult
| GetTaskResult
| GetTaskPayloadResult
| DeleteTaskResult
| EmptyResult
| CustomResult;
);
Expand All@@ -3399,9 +3399,29 @@ ts_union!(
| CreateMessageRequest
| ListRootsRequest
| CreateElicitationRequest
| GetTaskInfoRequest
| ListTasksRequest
| GetTaskResultRequest
| DeleteTaskRequest
| CustomRequest;
);

impl ServerRequest {
pub fn method(&self) -> &str {
match &self {
ServerRequest::PingRequest(r) => r.method.as_str(),
ServerRequest::CreateMessageRequest(r) => r.method.as_str(),
ServerRequest::ListRootsRequest(r) => r.method.as_str(),
ServerRequest::CreateElicitationRequest(r) => r.method.as_str(),
ServerRequest::GetTaskInfoRequest(r) => r.method.as_str(),
ServerRequest::ListTasksRequest(r) => r.method.as_str(),
ServerRequest::GetTaskResultRequest(r) => r.method.as_str(),
ServerRequest::DeleteTaskRequest(r) => r.method.as_str(),
ServerRequest::CustomRequest(r) => r.method.as_str(),
}
}
}

ts_union!(
export type ServerNotification =
| CancelledNotification
Expand DownExpand Up@@ -3429,7 +3449,7 @@ ts_union!(
| CreateTaskResult
| ListTasksResult
| GetTaskResult
| CancelTaskResult
| DeleteTaskResult
| CallToolResult
| GetTaskPayloadResult
| EmptyResult
Expand Down
6 changes: 5 additions & 1 deletion crates/rmcp/src/model/meta.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,7 +155,7 @@ variant_extension! {
GetTaskInfoRequest
ListTasksRequest
GetTaskResultRequest
CancelTaskRequest
DeleteTaskRequest
}
}

Expand All@@ -166,6 +166,10 @@ variant_extension! {
ListRootsRequest
CreateElicitationRequest
CustomRequest
GetTaskInfoRequest
ListTasksRequest
GetTaskResultRequest
DeleteTaskRequest
}
}

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 8 additions & 22 deletions crates/rmcp-macros/src/task_handler.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -223,38 +223,24 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
.push(syn::parse2::<ImplItem>(get_result_fn)?);
}

if !has_method("cancel_task", &item_impl) {
let cancel_fn = quote! {
async fn cancel_task(
if !has_method("delete_task", &item_impl) {
let delete_fn = quote! {
async fn delete_task(
&self,
request: rmcp::model::CancelTaskParams,
request: rmcp::model::DeleteTaskParams,
_context: rmcp::service::RequestContext<rmcp::RoleServer>,
) -> Result<rmcp::model::CancelTaskResult, McpError> {
use rmcp::task_manager::current_timestamp;
) -> Result<rmcp::model::DeleteTaskResult, McpError> {
let task_id = request.task_id;
let mut processor = (#processor).lock().await;

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

// If already completed, signal it's not cancellable
let exists_completed = processor.peek_completed().iter().any(|r| r.descriptor.operation_id == task_id);
if exists_completed {
return Err(McpError::invalid_request(format!("task already completed: {}", task_id), None));
if processor.delete_task(&task_id) {
return Ok(rmcp::model::DeleteTaskResult { meta: None });
}

Err(McpError::resource_not_found(format!("task not found: {}", task_id), None))
}
};
item_impl.items.push(syn::parse2::<ImplItem>(cancel_fn)?);
item_impl.items.push(syn::parse2::<ImplItem>(delete_fn)?);
}

// Auto-generate get_info() if not already provided and no sibling tool/prompt handler
Expand Down
15 changes: 15 additions & 0 deletions crates/rmcp/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,16 @@ features = [
]
rustdoc-args = ["--cfg", "docsrs"]

# The protocol message unions in `model.rs` (`ClientRequest`, `ServerRequest`,
# `ClientResult`, `ServerResult`, …) are generated by `ts_union!` and are
# intentionally `#[non_exhaustive]`-free (see the `clippy::exhaustive_enums`
# expectation on the macro): each new spec revision adds message variants.
# Adding a variant is non-breaking for downstream consumers — the enums are
# `#[serde(untagged)]` and gain `From` impls — so `enum_variant_added` is
# expected churn rather than a true semver break.
[package.metadata.cargo-semver-checks.lints]
enum_variant_added = "allow"

[dependencies]
async-trait = "0.1.89"
serde = { version = "1.0", features = ["derive", "rc"] }
Expand DownExpand Up@@ -293,6 +303,11 @@ name = "test_custom_request"
required-features = ["server", "client"]
path = "tests/test_custom_request.rs"

[[test]]
name = "test_task_client_receiver"
required-features = ["server", "client"]
path = "tests/test_task_client_receiver.rs"

[[test]]
name = "test_prompt_macros"
required-features = ["server", "client"]
Expand Down
110 changes: 110 additions & 0 deletions crates/rmcp/src/handler/client.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,22 @@ impl<H: ClientHandler> Service<RoleClient> for H {
.create_elicitation(request.params, context)
.await
.map(ClientResult::CreateElicitationResult),
ServerRequest::ListTasksRequest(request) => self
.list_tasks(request.params, context)
.await
.map(ClientResult::ListTasksResult),
ServerRequest::GetTaskInfoRequest(request) => self
.get_task_info(request.params, context)
.await
.map(ClientResult::GetTaskResult),
ServerRequest::GetTaskResultRequest(request) => self
.get_task_result(request.params, context)
.await
.map(ClientResult::GetTaskPayloadResult),
ServerRequest::DeleteTaskRequest(request) => self
.delete_task(request.params, context)
.await
.map(ClientResult::DeleteTaskResult),
ServerRequest::CustomRequest(request) => self
.on_custom_request(request, context)
.await
Expand DownExpand Up@@ -191,6 +207,68 @@ pub trait ClientHandler: Sized + Send + Sync + 'static {
)))
}

/// Handle a `tasks/list` request from a server. Only relevant when the
/// client is also a task *receiver* (e.g. it accepted a task-augmented
/// `sampling/createMessage` or `elicitation/create` request).
///
/// # Default Behavior
/// Returns `-32601` (Method not found). Clients that advertise
/// `capabilities.tasks.list` must override this.
fn list_tasks(
&self,
request: Option<PaginatedRequestParams>,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<ListTasksResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<ListTasksMethod>()))
}

/// Handle a `tasks/get` request from a server. Only relevant when the
/// client is also a task *receiver* (e.g. it accepted a task-augmented
/// `sampling/createMessage` or `elicitation/create` request).
///
/// # Default Behavior
/// Returns `-32601` (Method not found). Clients that advertise
/// `capabilities.tasks.requests.sampling.createMessage` or
/// `capabilities.tasks.requests.elicitation.create` must override this.
fn get_task_info(
&self,
request: GetTaskInfoParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<GetTaskResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<GetTaskInfoMethod>()))
}

/// Handle a `tasks/result` request from a server. Only relevant when
/// the client is also a task *receiver*.
///
/// # Default Behavior
/// Returns `-32601` (Method not found).
fn get_task_result(
&self,
request: GetTaskResultParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<GetTaskPayloadResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<GetTaskResultMethod>()))
}

/// Handle a `tasks/delete` request from a server (SEP-1686 §3.6).
/// Only relevant when the client is also a task *receiver*.
///
/// # Default Behavior
/// Returns `-32601` (Method not found). Task receivers must override this
/// to delete the task and any associated stored result.
fn delete_task(
&self,
request: DeleteTaskParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<DeleteTaskMethod>()))
}

fn on_cancelled(
&self,
params: CancelledNotificationParam,
Expand DownExpand Up@@ -310,6 +388,38 @@ macro_rules! impl_client_handler_for_wrapper {
(**self).on_custom_request(request, context)
}

fn list_tasks(
&self,
request: Option<PaginatedRequestParams>,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<ListTasksResult, McpError>> + MaybeSendFuture + '_ {
(**self).list_tasks(request, context)
}

fn get_task_info(
&self,
request: GetTaskInfoParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<GetTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).get_task_info(request, context)
}

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

fn delete_task(
&self,
request: DeleteTaskParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).delete_task(request, context)
}

fn on_cancelled(
&self,
params: CancelledNotificationParam,
Expand Down
22 changes: 11 additions & 11 deletions crates/rmcp/src/handler/server.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,10 +125,10 @@ impl<H: ServerHandler> Service<RoleServer> for H {
.get_task_result(request.params, context)
.await
.map(ServerResult::GetTaskPayloadResult),
ClientRequest::CancelTaskRequest(request) => self
.cancel_task(request.params, context)
ClientRequest::DeleteTaskRequest(request) => self
.delete_task(request.params, context)
.await
.map(ServerResult::CancelTaskResult),
.map(ServerResult::DeleteTaskResult),
};
// SEP-2164: peers negotiating 2026-07-28+ get the standard INVALID_PARAMS code for
// resource-not-found; older peers keep RESOURCE_NOT_FOUND. ISO `YYYY-MM-DD` versions
Expand DownExpand Up@@ -398,13 +398,13 @@ macro_rules! server_handler_methods {
std::future::ready(Err(McpError::method_not_found::<GetTaskResultMethod>()))
}

fn cancel_task(
fn delete_task(
&self,
request: CancelTaskParams,
request: DeleteTaskParams,
context: RequestContext<RoleServer>,
) -> impl Future<Output = Result<CancelTaskResult, McpError>> + MaybeSendFuture + '_ {
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<CancelTaskMethod>()))
std::future::ready(Err(McpError::method_not_found::<DeleteTaskMethod>()))
}
};
}
Expand DownExpand Up@@ -614,12 +614,12 @@ macro_rules! impl_server_handler_for_wrapper {
(**self).get_task_result(request, context)
}

fn cancel_task(
fn delete_task(
&self,
request: CancelTaskParams,
request: DeleteTaskParams,
context: RequestContext<RoleServer>,
) -> impl Future<Output = Result<CancelTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).cancel_task(request, context)
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).delete_task(request, context)
}
}
};
Expand Down
42 changes: 31 additions & 11 deletions crates/rmcp/src/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -3213,32 +3213,28 @@ impl RequestParamsMeta for GetTaskResultParams {
#[deprecated(since = "0.13.0", note = "Use GetTaskResultParams instead")]
pub type GetTaskResultParam = GetTaskResultParams;

const_string!(CancelTaskMethod = "tasks/cancel");
pub type CancelTaskRequest = Request<CancelTaskMethod, CancelTaskParams>;
const_string!(DeleteTaskMethod = "tasks/delete");
pub type DeleteTaskRequest = Request<DeleteTaskMethod, DeleteTaskParams>;

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct CancelTaskParams {
pub struct DeleteTaskParams {
/// Protocol-level metadata for this request (SEP-1319)
#[serde(rename = "_meta", default, skip_serializing_if = "Option::is_none")]
pub meta: Option<Meta>,
pub task_id: String,
}

impl RequestParamsMeta for CancelTaskParams {
impl RequestParamsMeta for DeleteTaskParams {
fn meta(&self) -> Option<&Meta> {
self.meta.as_ref()
}
fn meta_mut(&mut self) -> &mut Option<Meta> {
&mut self.meta
}
}

/// Deprecated: Use [`CancelTaskParams`] instead (SEP-1319 compliance).
#[deprecated(since = "0.13.0", note = "Use CancelTaskParams instead")]
pub type CancelTaskParam = CancelTaskParams;
/// Deprecated: Use [`GetTaskResult`] instead (spec alignment).
#[deprecated(since = "0.15.0", note = "Use GetTaskResult instead")]
pub type GetTaskInfoResult = GetTaskResult;
Expand DownExpand Up@@ -3338,7 +3334,7 @@ ts_union!(
| GetTaskInfoRequest
| ListTasksRequest
| GetTaskResultRequest
| CancelTaskRequest
| DeleteTaskRequest
| CustomRequest;
);

Expand All@@ -3361,7 +3357,7 @@ impl ClientRequest {
ClientRequest::GetTaskInfoRequest(r) => r.method.as_str(),
ClientRequest::ListTasksRequest(r) => r.method.as_str(),
ClientRequest::GetTaskResultRequest(r) => r.method.as_str(),
ClientRequest::CancelTaskRequest(r) => r.method.as_str(),
ClientRequest::DeleteTaskRequest(r) => r.method.as_str(),
ClientRequest::CustomRequest(r) => r.method.as_str(),
}
}
Expand All@@ -3381,6 +3377,10 @@ ts_union!(
box CreateMessageResult
| ListRootsResult
| CreateElicitationResult
| ListTasksResult
| GetTaskResult
| GetTaskPayloadResult
| DeleteTaskResult
| EmptyResult
| CustomResult;
);
Expand All@@ -3399,9 +3399,29 @@ ts_union!(
| CreateMessageRequest
| ListRootsRequest
| CreateElicitationRequest
| GetTaskInfoRequest
| ListTasksRequest
| GetTaskResultRequest
| DeleteTaskRequest
| CustomRequest;
);

impl ServerRequest {
pub fn method(&self) -> &str {
match &self {
ServerRequest::PingRequest(r) => r.method.as_str(),
ServerRequest::CreateMessageRequest(r) => r.method.as_str(),
ServerRequest::ListRootsRequest(r) => r.method.as_str(),
ServerRequest::CreateElicitationRequest(r) => r.method.as_str(),
ServerRequest::GetTaskInfoRequest(r) => r.method.as_str(),
ServerRequest::ListTasksRequest(r) => r.method.as_str(),
ServerRequest::GetTaskResultRequest(r) => r.method.as_str(),
ServerRequest::DeleteTaskRequest(r) => r.method.as_str(),
ServerRequest::CustomRequest(r) => r.method.as_str(),
}
}
}

ts_union!(
export type ServerNotification =
| CancelledNotification
Expand DownExpand Up@@ -3429,7 +3449,7 @@ ts_union!(
| CreateTaskResult
| ListTasksResult
| GetTaskResult
| CancelTaskResult
| DeleteTaskResult
| CallToolResult
| GetTaskPayloadResult
| EmptyResult
Expand Down
6 changes: 5 additions & 1 deletion crates/rmcp/src/model/meta.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,7 +155,7 @@ variant_extension! {
GetTaskInfoRequest
ListTasksRequest
GetTaskResultRequest
CancelTaskRequest
DeleteTaskRequest
}
}

Expand All@@ -166,6 +166,10 @@ variant_extension! {
ListRootsRequest
CreateElicitationRequest
CustomRequest
GetTaskInfoRequest
ListTasksRequest
GetTaskResultRequest
DeleteTaskRequest
}
}

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 8 additions & 22 deletions crates/rmcp-macros/src/task_handler.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -223,38 +223,24 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
.push(syn::parse2::<ImplItem>(get_result_fn)?);
}

if !has_method("cancel_task", &item_impl) {
let cancel_fn = quote! {
async fn cancel_task(
if !has_method("delete_task", &item_impl) {
let delete_fn = quote! {
async fn delete_task(
&self,
request: rmcp::model::CancelTaskParams,
request: rmcp::model::DeleteTaskParams,
_context: rmcp::service::RequestContext<rmcp::RoleServer>,
) -> Result<rmcp::model::CancelTaskResult, McpError> {
use rmcp::task_manager::current_timestamp;
) -> Result<rmcp::model::DeleteTaskResult, McpError> {
let task_id = request.task_id;
let mut processor = (#processor).lock().await;

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

// If already completed, signal it's not cancellable
let exists_completed = processor.peek_completed().iter().any(|r| r.descriptor.operation_id == task_id);
if exists_completed {
return Err(McpError::invalid_request(format!("task already completed: {}", task_id), None));
if processor.delete_task(&task_id) {
return Ok(rmcp::model::DeleteTaskResult { meta: None });
}

Err(McpError::resource_not_found(format!("task not found: {}", task_id), None))
}
};
item_impl.items.push(syn::parse2::<ImplItem>(cancel_fn)?);
item_impl.items.push(syn::parse2::<ImplItem>(delete_fn)?);
}

// Auto-generate get_info() if not already provided and no sibling tool/prompt handler
Expand Down
15 changes: 15 additions & 0 deletions crates/rmcp/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,16 @@ features = [
]
rustdoc-args = ["--cfg", "docsrs"]

# The protocol message unions in `model.rs` (`ClientRequest`, `ServerRequest`,
# `ClientResult`, `ServerResult`, …) are generated by `ts_union!` and are
# intentionally `#[non_exhaustive]`-free (see the `clippy::exhaustive_enums`
# expectation on the macro): each new spec revision adds message variants.
# Adding a variant is non-breaking for downstream consumers — the enums are
# `#[serde(untagged)]` and gain `From` impls — so `enum_variant_added` is
# expected churn rather than a true semver break.
[package.metadata.cargo-semver-checks.lints]
enum_variant_added = "allow"

[dependencies]
async-trait = "0.1.89"
serde = { version = "1.0", features = ["derive", "rc"] }
Expand DownExpand Up@@ -293,6 +303,11 @@ name = "test_custom_request"
required-features = ["server", "client"]
path = "tests/test_custom_request.rs"

[[test]]
name = "test_task_client_receiver"
required-features = ["server", "client"]
path = "tests/test_task_client_receiver.rs"

[[test]]
name = "test_prompt_macros"
required-features = ["server", "client"]
Expand Down
110 changes: 110 additions & 0 deletions crates/rmcp/src/handler/client.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,22 @@ impl<H: ClientHandler> Service<RoleClient> for H {
.create_elicitation(request.params, context)
.await
.map(ClientResult::CreateElicitationResult),
ServerRequest::ListTasksRequest(request) => self
.list_tasks(request.params, context)
.await
.map(ClientResult::ListTasksResult),
ServerRequest::GetTaskInfoRequest(request) => self
.get_task_info(request.params, context)
.await
.map(ClientResult::GetTaskResult),
ServerRequest::GetTaskResultRequest(request) => self
.get_task_result(request.params, context)
.await
.map(ClientResult::GetTaskPayloadResult),
ServerRequest::DeleteTaskRequest(request) => self
.delete_task(request.params, context)
.await
.map(ClientResult::DeleteTaskResult),
ServerRequest::CustomRequest(request) => self
.on_custom_request(request, context)
.await
Expand DownExpand Up@@ -191,6 +207,68 @@ pub trait ClientHandler: Sized + Send + Sync + 'static {
)))
}

/// Handle a `tasks/list` request from a server. Only relevant when the
/// client is also a task *receiver* (e.g. it accepted a task-augmented
/// `sampling/createMessage` or `elicitation/create` request).
///
/// # Default Behavior
/// Returns `-32601` (Method not found). Clients that advertise
/// `capabilities.tasks.list` must override this.
fn list_tasks(
&self,
request: Option<PaginatedRequestParams>,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<ListTasksResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<ListTasksMethod>()))
}

/// Handle a `tasks/get` request from a server. Only relevant when the
/// client is also a task *receiver* (e.g. it accepted a task-augmented
/// `sampling/createMessage` or `elicitation/create` request).
///
/// # Default Behavior
/// Returns `-32601` (Method not found). Clients that advertise
/// `capabilities.tasks.requests.sampling.createMessage` or
/// `capabilities.tasks.requests.elicitation.create` must override this.
fn get_task_info(
&self,
request: GetTaskInfoParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<GetTaskResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<GetTaskInfoMethod>()))
}

/// Handle a `tasks/result` request from a server. Only relevant when
/// the client is also a task *receiver*.
///
/// # Default Behavior
/// Returns `-32601` (Method not found).
fn get_task_result(
&self,
request: GetTaskResultParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<GetTaskPayloadResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<GetTaskResultMethod>()))
}

/// Handle a `tasks/delete` request from a server (SEP-1686 §3.6).
/// Only relevant when the client is also a task *receiver*.
///
/// # Default Behavior
/// Returns `-32601` (Method not found). Task receivers must override this
/// to delete the task and any associated stored result.
fn delete_task(
&self,
request: DeleteTaskParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<DeleteTaskMethod>()))
}

fn on_cancelled(
&self,
params: CancelledNotificationParam,
Expand DownExpand Up@@ -310,6 +388,38 @@ macro_rules! impl_client_handler_for_wrapper {
(**self).on_custom_request(request, context)
}

fn list_tasks(
&self,
request: Option<PaginatedRequestParams>,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<ListTasksResult, McpError>> + MaybeSendFuture + '_ {
(**self).list_tasks(request, context)
}

fn get_task_info(
&self,
request: GetTaskInfoParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<GetTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).get_task_info(request, context)
}

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

fn delete_task(
&self,
request: DeleteTaskParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).delete_task(request, context)
}

fn on_cancelled(
&self,
params: CancelledNotificationParam,
Expand Down
22 changes: 11 additions & 11 deletions crates/rmcp/src/handler/server.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,10 +125,10 @@ impl<H: ServerHandler> Service<RoleServer> for H {
.get_task_result(request.params, context)
.await
.map(ServerResult::GetTaskPayloadResult),
ClientRequest::CancelTaskRequest(request) => self
.cancel_task(request.params, context)
ClientRequest::DeleteTaskRequest(request) => self
.delete_task(request.params, context)
.await
.map(ServerResult::CancelTaskResult),
.map(ServerResult::DeleteTaskResult),
};
// SEP-2164: peers negotiating 2026-07-28+ get the standard INVALID_PARAMS code for
// resource-not-found; older peers keep RESOURCE_NOT_FOUND. ISO `YYYY-MM-DD` versions
Expand DownExpand Up@@ -398,13 +398,13 @@ macro_rules! server_handler_methods {
std::future::ready(Err(McpError::method_not_found::<GetTaskResultMethod>()))
}

fn cancel_task(
fn delete_task(
&self,
request: CancelTaskParams,
request: DeleteTaskParams,
context: RequestContext<RoleServer>,
) -> impl Future<Output = Result<CancelTaskResult, McpError>> + MaybeSendFuture + '_ {
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<CancelTaskMethod>()))
std::future::ready(Err(McpError::method_not_found::<DeleteTaskMethod>()))
}
};
}
Expand DownExpand Up@@ -614,12 +614,12 @@ macro_rules! impl_server_handler_for_wrapper {
(**self).get_task_result(request, context)
}

fn cancel_task(
fn delete_task(
&self,
request: CancelTaskParams,
request: DeleteTaskParams,
context: RequestContext<RoleServer>,
) -> impl Future<Output = Result<CancelTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).cancel_task(request, context)
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).delete_task(request, context)
}
}
};
Expand Down
42 changes: 31 additions & 11 deletions crates/rmcp/src/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -3213,32 +3213,28 @@ impl RequestParamsMeta for GetTaskResultParams {
#[deprecated(since = "0.13.0", note = "Use GetTaskResultParams instead")]
pub type GetTaskResultParam = GetTaskResultParams;

const_string!(CancelTaskMethod = "tasks/cancel");
pub type CancelTaskRequest = Request<CancelTaskMethod, CancelTaskParams>;
const_string!(DeleteTaskMethod = "tasks/delete");
pub type DeleteTaskRequest = Request<DeleteTaskMethod, DeleteTaskParams>;

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct CancelTaskParams {
pub struct DeleteTaskParams {
/// Protocol-level metadata for this request (SEP-1319)
#[serde(rename = "_meta", default, skip_serializing_if = "Option::is_none")]
pub meta: Option<Meta>,
pub task_id: String,
}

impl RequestParamsMeta for CancelTaskParams {
impl RequestParamsMeta for DeleteTaskParams {
fn meta(&self) -> Option<&Meta> {
self.meta.as_ref()
}
fn meta_mut(&mut self) -> &mut Option<Meta> {
&mut self.meta
}
}

/// Deprecated: Use [`CancelTaskParams`] instead (SEP-1319 compliance).
#[deprecated(since = "0.13.0", note = "Use CancelTaskParams instead")]
pub type CancelTaskParam = CancelTaskParams;
/// Deprecated: Use [`GetTaskResult`] instead (spec alignment).
#[deprecated(since = "0.15.0", note = "Use GetTaskResult instead")]
pub type GetTaskInfoResult = GetTaskResult;
Expand DownExpand Up@@ -3338,7 +3334,7 @@ ts_union!(
| GetTaskInfoRequest
| ListTasksRequest
| GetTaskResultRequest
| CancelTaskRequest
| DeleteTaskRequest
| CustomRequest;
);

Expand All@@ -3361,7 +3357,7 @@ impl ClientRequest {
ClientRequest::GetTaskInfoRequest(r) => r.method.as_str(),
ClientRequest::ListTasksRequest(r) => r.method.as_str(),
ClientRequest::GetTaskResultRequest(r) => r.method.as_str(),
ClientRequest::CancelTaskRequest(r) => r.method.as_str(),
ClientRequest::DeleteTaskRequest(r) => r.method.as_str(),
ClientRequest::CustomRequest(r) => r.method.as_str(),
}
}
Expand All@@ -3381,6 +3377,10 @@ ts_union!(
box CreateMessageResult
| ListRootsResult
| CreateElicitationResult
| ListTasksResult
| GetTaskResult
| GetTaskPayloadResult
| DeleteTaskResult
| EmptyResult
| CustomResult;
);
Expand All@@ -3399,9 +3399,29 @@ ts_union!(
| CreateMessageRequest
| ListRootsRequest
| CreateElicitationRequest
| GetTaskInfoRequest
| ListTasksRequest
| GetTaskResultRequest
| DeleteTaskRequest
| CustomRequest;
);

impl ServerRequest {
pub fn method(&self) -> &str {
match &self {
ServerRequest::PingRequest(r) => r.method.as_str(),
ServerRequest::CreateMessageRequest(r) => r.method.as_str(),
ServerRequest::ListRootsRequest(r) => r.method.as_str(),
ServerRequest::CreateElicitationRequest(r) => r.method.as_str(),
ServerRequest::GetTaskInfoRequest(r) => r.method.as_str(),
ServerRequest::ListTasksRequest(r) => r.method.as_str(),
ServerRequest::GetTaskResultRequest(r) => r.method.as_str(),
ServerRequest::DeleteTaskRequest(r) => r.method.as_str(),
ServerRequest::CustomRequest(r) => r.method.as_str(),
}
}
}

ts_union!(
export type ServerNotification =
| CancelledNotification
Expand DownExpand Up@@ -3429,7 +3449,7 @@ ts_union!(
| CreateTaskResult
| ListTasksResult
| GetTaskResult
| CancelTaskResult
| DeleteTaskResult
| CallToolResult
| GetTaskPayloadResult
| EmptyResult
Expand Down
6 changes: 5 additions & 1 deletion crates/rmcp/src/model/meta.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,7 +155,7 @@ variant_extension! {
GetTaskInfoRequest
ListTasksRequest
GetTaskResultRequest
CancelTaskRequest
DeleteTaskRequest
}
}

Expand All@@ -166,6 +166,10 @@ variant_extension! {
ListRootsRequest
CreateElicitationRequest
CustomRequest
GetTaskInfoRequest
ListTasksRequest
GetTaskResultRequest
DeleteTaskRequest
}
}

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } 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
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 8 additions & 22 deletions crates/rmcp-macros/src/task_handler.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -223,38 +223,24 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
.push(syn::parse2::<ImplItem>(get_result_fn)?);
}

if !has_method("cancel_task", &item_impl) {
let cancel_fn = quote! {
async fn cancel_task(
if !has_method("delete_task", &item_impl) {
let delete_fn = quote! {
async fn delete_task(
&self,
request: rmcp::model::CancelTaskParams,
request: rmcp::model::DeleteTaskParams,
_context: rmcp::service::RequestContext<rmcp::RoleServer>,
) -> Result<rmcp::model::CancelTaskResult, McpError> {
use rmcp::task_manager::current_timestamp;
) -> Result<rmcp::model::DeleteTaskResult, McpError> {
let task_id = request.task_id;
let mut processor = (#processor).lock().await;

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

// If already completed, signal it's not cancellable
let exists_completed = processor.peek_completed().iter().any(|r| r.descriptor.operation_id == task_id);
if exists_completed {
return Err(McpError::invalid_request(format!("task already completed: {}", task_id), None));
if processor.delete_task(&task_id) {
return Ok(rmcp::model::DeleteTaskResult { meta: None });
}

Err(McpError::resource_not_found(format!("task not found: {}", task_id), None))
}
};
item_impl.items.push(syn::parse2::<ImplItem>(cancel_fn)?);
item_impl.items.push(syn::parse2::<ImplItem>(delete_fn)?);
}

// Auto-generate get_info() if not already provided and no sibling tool/prompt handler
Expand Down
15 changes: 15 additions & 0 deletions crates/rmcp/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,16 @@ features = [
]
rustdoc-args = ["--cfg", "docsrs"]

# The protocol message unions in `model.rs` (`ClientRequest`, `ServerRequest`,
# `ClientResult`, `ServerResult`, …) are generated by `ts_union!` and are
# intentionally `#[non_exhaustive]`-free (see the `clippy::exhaustive_enums`
# expectation on the macro): each new spec revision adds message variants.
# Adding a variant is non-breaking for downstream consumers — the enums are
# `#[serde(untagged)]` and gain `From` impls — so `enum_variant_added` is
# expected churn rather than a true semver break.
[package.metadata.cargo-semver-checks.lints]
enum_variant_added = "allow"

[dependencies]
async-trait = "0.1.89"
serde = { version = "1.0", features = ["derive", "rc"] }
Expand DownExpand Up@@ -293,6 +303,11 @@ name = "test_custom_request"
required-features = ["server", "client"]
path = "tests/test_custom_request.rs"

[[test]]
name = "test_task_client_receiver"
required-features = ["server", "client"]
path = "tests/test_task_client_receiver.rs"

[[test]]
name = "test_prompt_macros"
required-features = ["server", "client"]
Expand Down
110 changes: 110 additions & 0 deletions crates/rmcp/src/handler/client.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,22 @@ impl<H: ClientHandler> Service<RoleClient> for H {
.create_elicitation(request.params, context)
.await
.map(ClientResult::CreateElicitationResult),
ServerRequest::ListTasksRequest(request) => self
.list_tasks(request.params, context)
.await
.map(ClientResult::ListTasksResult),
ServerRequest::GetTaskInfoRequest(request) => self
.get_task_info(request.params, context)
.await
.map(ClientResult::GetTaskResult),
ServerRequest::GetTaskResultRequest(request) => self
.get_task_result(request.params, context)
.await
.map(ClientResult::GetTaskPayloadResult),
ServerRequest::DeleteTaskRequest(request) => self
.delete_task(request.params, context)
.await
.map(ClientResult::DeleteTaskResult),
ServerRequest::CustomRequest(request) => self
.on_custom_request(request, context)
.await
Expand DownExpand Up@@ -191,6 +207,68 @@ pub trait ClientHandler: Sized + Send + Sync + 'static {
)))
}

/// Handle a `tasks/list` request from a server. Only relevant when the
/// client is also a task *receiver* (e.g. it accepted a task-augmented
/// `sampling/createMessage` or `elicitation/create` request).
///
/// # Default Behavior
/// Returns `-32601` (Method not found). Clients that advertise
/// `capabilities.tasks.list` must override this.
fn list_tasks(
&self,
request: Option<PaginatedRequestParams>,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<ListTasksResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<ListTasksMethod>()))
}

/// Handle a `tasks/get` request from a server. Only relevant when the
/// client is also a task *receiver* (e.g. it accepted a task-augmented
/// `sampling/createMessage` or `elicitation/create` request).
///
/// # Default Behavior
/// Returns `-32601` (Method not found). Clients that advertise
/// `capabilities.tasks.requests.sampling.createMessage` or
/// `capabilities.tasks.requests.elicitation.create` must override this.
fn get_task_info(
&self,
request: GetTaskInfoParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<GetTaskResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<GetTaskInfoMethod>()))
}

/// Handle a `tasks/result` request from a server. Only relevant when
/// the client is also a task *receiver*.
///
/// # Default Behavior
/// Returns `-32601` (Method not found).
fn get_task_result(
&self,
request: GetTaskResultParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<GetTaskPayloadResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<GetTaskResultMethod>()))
}

/// Handle a `tasks/delete` request from a server (SEP-1686 §3.6).
/// Only relevant when the client is also a task *receiver*.
///
/// # Default Behavior
/// Returns `-32601` (Method not found). Task receivers must override this
/// to delete the task and any associated stored result.
fn delete_task(
&self,
request: DeleteTaskParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<DeleteTaskMethod>()))
}

fn on_cancelled(
&self,
params: CancelledNotificationParam,
Expand DownExpand Up@@ -310,6 +388,38 @@ macro_rules! impl_client_handler_for_wrapper {
(**self).on_custom_request(request, context)
}

fn list_tasks(
&self,
request: Option<PaginatedRequestParams>,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<ListTasksResult, McpError>> + MaybeSendFuture + '_ {
(**self).list_tasks(request, context)
}

fn get_task_info(
&self,
request: GetTaskInfoParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<GetTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).get_task_info(request, context)
}

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

fn delete_task(
&self,
request: DeleteTaskParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).delete_task(request, context)
}

fn on_cancelled(
&self,
params: CancelledNotificationParam,
Expand Down
22 changes: 11 additions & 11 deletions crates/rmcp/src/handler/server.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,10 +125,10 @@ impl<H: ServerHandler> Service<RoleServer> for H {
.get_task_result(request.params, context)
.await
.map(ServerResult::GetTaskPayloadResult),
ClientRequest::CancelTaskRequest(request) => self
.cancel_task(request.params, context)
ClientRequest::DeleteTaskRequest(request) => self
.delete_task(request.params, context)
.await
.map(ServerResult::CancelTaskResult),
.map(ServerResult::DeleteTaskResult),
};
// SEP-2164: peers negotiating 2026-07-28+ get the standard INVALID_PARAMS code for
// resource-not-found; older peers keep RESOURCE_NOT_FOUND. ISO `YYYY-MM-DD` versions
Expand DownExpand Up@@ -398,13 +398,13 @@ macro_rules! server_handler_methods {
std::future::ready(Err(McpError::method_not_found::<GetTaskResultMethod>()))
}

fn cancel_task(
fn delete_task(
&self,
request: CancelTaskParams,
request: DeleteTaskParams,
context: RequestContext<RoleServer>,
) -> impl Future<Output = Result<CancelTaskResult, McpError>> + MaybeSendFuture + '_ {
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<CancelTaskMethod>()))
std::future::ready(Err(McpError::method_not_found::<DeleteTaskMethod>()))
}
};
}
Expand DownExpand Up@@ -614,12 +614,12 @@ macro_rules! impl_server_handler_for_wrapper {
(**self).get_task_result(request, context)
}

fn cancel_task(
fn delete_task(
&self,
request: CancelTaskParams,
request: DeleteTaskParams,
context: RequestContext<RoleServer>,
) -> impl Future<Output = Result<CancelTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).cancel_task(request, context)
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).delete_task(request, context)
}
}
};
Expand Down
42 changes: 31 additions & 11 deletions crates/rmcp/src/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -3213,32 +3213,28 @@ impl RequestParamsMeta for GetTaskResultParams {
#[deprecated(since = "0.13.0", note = "Use GetTaskResultParams instead")]
pub type GetTaskResultParam = GetTaskResultParams;

const_string!(CancelTaskMethod = "tasks/cancel");
pub type CancelTaskRequest = Request<CancelTaskMethod, CancelTaskParams>;
const_string!(DeleteTaskMethod = "tasks/delete");
pub type DeleteTaskRequest = Request<DeleteTaskMethod, DeleteTaskParams>;

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct CancelTaskParams {
pub struct DeleteTaskParams {
/// Protocol-level metadata for this request (SEP-1319)
#[serde(rename = "_meta", default, skip_serializing_if = "Option::is_none")]
pub meta: Option<Meta>,
pub task_id: String,
}

impl RequestParamsMeta for CancelTaskParams {
impl RequestParamsMeta for DeleteTaskParams {
fn meta(&self) -> Option<&Meta> {
self.meta.as_ref()
}
fn meta_mut(&mut self) -> &mut Option<Meta> {
&mut self.meta
}
}

/// Deprecated: Use [`CancelTaskParams`] instead (SEP-1319 compliance).
#[deprecated(since = "0.13.0", note = "Use CancelTaskParams instead")]
pub type CancelTaskParam = CancelTaskParams;
/// Deprecated: Use [`GetTaskResult`] instead (spec alignment).
#[deprecated(since = "0.15.0", note = "Use GetTaskResult instead")]
pub type GetTaskInfoResult = GetTaskResult;
Expand DownExpand Up@@ -3338,7 +3334,7 @@ ts_union!(
| GetTaskInfoRequest
| ListTasksRequest
| GetTaskResultRequest
| CancelTaskRequest
| DeleteTaskRequest
| CustomRequest;
);

Expand All@@ -3361,7 +3357,7 @@ impl ClientRequest {
ClientRequest::GetTaskInfoRequest(r) => r.method.as_str(),
ClientRequest::ListTasksRequest(r) => r.method.as_str(),
ClientRequest::GetTaskResultRequest(r) => r.method.as_str(),
ClientRequest::CancelTaskRequest(r) => r.method.as_str(),
ClientRequest::DeleteTaskRequest(r) => r.method.as_str(),
ClientRequest::CustomRequest(r) => r.method.as_str(),
}
}
Expand All@@ -3381,6 +3377,10 @@ ts_union!(
box CreateMessageResult
| ListRootsResult
| CreateElicitationResult
| ListTasksResult
| GetTaskResult
| GetTaskPayloadResult
| DeleteTaskResult
| EmptyResult
| CustomResult;
);
Expand All@@ -3399,9 +3399,29 @@ ts_union!(
| CreateMessageRequest
| ListRootsRequest
| CreateElicitationRequest
| GetTaskInfoRequest
| ListTasksRequest
| GetTaskResultRequest
| DeleteTaskRequest
| CustomRequest;
);

impl ServerRequest {
pub fn method(&self) -> &str {
match &self {
ServerRequest::PingRequest(r) => r.method.as_str(),
ServerRequest::CreateMessageRequest(r) => r.method.as_str(),
ServerRequest::ListRootsRequest(r) => r.method.as_str(),
ServerRequest::CreateElicitationRequest(r) => r.method.as_str(),
ServerRequest::GetTaskInfoRequest(r) => r.method.as_str(),
ServerRequest::ListTasksRequest(r) => r.method.as_str(),
ServerRequest::GetTaskResultRequest(r) => r.method.as_str(),
ServerRequest::DeleteTaskRequest(r) => r.method.as_str(),
ServerRequest::CustomRequest(r) => r.method.as_str(),
}
}
}

ts_union!(
export type ServerNotification =
| CancelledNotification
Expand DownExpand Up@@ -3429,7 +3449,7 @@ ts_union!(
| CreateTaskResult
| ListTasksResult
| GetTaskResult
| CancelTaskResult
| DeleteTaskResult
| CallToolResult
| GetTaskPayloadResult
| EmptyResult
Expand Down
6 changes: 5 additions & 1 deletion crates/rmcp/src/model/meta.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,7 +155,7 @@ variant_extension! {
GetTaskInfoRequest
ListTasksRequest
GetTaskResultRequest
CancelTaskRequest
DeleteTaskRequest
}
}

Expand All@@ -166,6 +166,10 @@ variant_extension! {
ListRootsRequest
CreateElicitationRequest
CustomRequest
GetTaskInfoRequest
ListTasksRequest
GetTaskResultRequest
DeleteTaskRequest
}
}

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 8 additions & 22 deletions crates/rmcp-macros/src/task_handler.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -223,38 +223,24 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
.push(syn::parse2::<ImplItem>(get_result_fn)?);
}

if !has_method("cancel_task", &item_impl) {
let cancel_fn = quote! {
async fn cancel_task(
if !has_method("delete_task", &item_impl) {
let delete_fn = quote! {
async fn delete_task(
&self,
request: rmcp::model::CancelTaskParams,
request: rmcp::model::DeleteTaskParams,
_context: rmcp::service::RequestContext<rmcp::RoleServer>,
) -> Result<rmcp::model::CancelTaskResult, McpError> {
use rmcp::task_manager::current_timestamp;
) -> Result<rmcp::model::DeleteTaskResult, McpError> {
let task_id = request.task_id;
let mut processor = (#processor).lock().await;

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

// If already completed, signal it's not cancellable
let exists_completed = processor.peek_completed().iter().any(|r| r.descriptor.operation_id == task_id);
if exists_completed {
return Err(McpError::invalid_request(format!("task already completed: {}", task_id), None));
if processor.delete_task(&task_id) {
return Ok(rmcp::model::DeleteTaskResult { meta: None });
}

Err(McpError::resource_not_found(format!("task not found: {}", task_id), None))
}
};
item_impl.items.push(syn::parse2::<ImplItem>(cancel_fn)?);
item_impl.items.push(syn::parse2::<ImplItem>(delete_fn)?);
}

// Auto-generate get_info() if not already provided and no sibling tool/prompt handler
Expand Down
15 changes: 15 additions & 0 deletions crates/rmcp/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,16 @@ features = [
]
rustdoc-args = ["--cfg", "docsrs"]

# The protocol message unions in `model.rs` (`ClientRequest`, `ServerRequest`,
# `ClientResult`, `ServerResult`, …) are generated by `ts_union!` and are
# intentionally `#[non_exhaustive]`-free (see the `clippy::exhaustive_enums`
# expectation on the macro): each new spec revision adds message variants.
# Adding a variant is non-breaking for downstream consumers — the enums are
# `#[serde(untagged)]` and gain `From` impls — so `enum_variant_added` is
# expected churn rather than a true semver break.
[package.metadata.cargo-semver-checks.lints]
enum_variant_added = "allow"

[dependencies]
async-trait = "0.1.89"
serde = { version = "1.0", features = ["derive", "rc"] }
Expand DownExpand Up@@ -293,6 +303,11 @@ name = "test_custom_request"
required-features = ["server", "client"]
path = "tests/test_custom_request.rs"

[[test]]
name = "test_task_client_receiver"
required-features = ["server", "client"]
path = "tests/test_task_client_receiver.rs"

[[test]]
name = "test_prompt_macros"
required-features = ["server", "client"]
Expand Down
110 changes: 110 additions & 0 deletions crates/rmcp/src/handler/client.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,22 @@ impl<H: ClientHandler> Service<RoleClient> for H {
.create_elicitation(request.params, context)
.await
.map(ClientResult::CreateElicitationResult),
ServerRequest::ListTasksRequest(request) => self
.list_tasks(request.params, context)
.await
.map(ClientResult::ListTasksResult),
ServerRequest::GetTaskInfoRequest(request) => self
.get_task_info(request.params, context)
.await
.map(ClientResult::GetTaskResult),
ServerRequest::GetTaskResultRequest(request) => self
.get_task_result(request.params, context)
.await
.map(ClientResult::GetTaskPayloadResult),
ServerRequest::DeleteTaskRequest(request) => self
.delete_task(request.params, context)
.await
.map(ClientResult::DeleteTaskResult),
ServerRequest::CustomRequest(request) => self
.on_custom_request(request, context)
.await
Expand DownExpand Up@@ -191,6 +207,68 @@ pub trait ClientHandler: Sized + Send + Sync + 'static {
)))
}

/// Handle a `tasks/list` request from a server. Only relevant when the
/// client is also a task *receiver* (e.g. it accepted a task-augmented
/// `sampling/createMessage` or `elicitation/create` request).
///
/// # Default Behavior
/// Returns `-32601` (Method not found). Clients that advertise
/// `capabilities.tasks.list` must override this.
fn list_tasks(
&self,
request: Option<PaginatedRequestParams>,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<ListTasksResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<ListTasksMethod>()))
}

/// Handle a `tasks/get` request from a server. Only relevant when the
/// client is also a task *receiver* (e.g. it accepted a task-augmented
/// `sampling/createMessage` or `elicitation/create` request).
///
/// # Default Behavior
/// Returns `-32601` (Method not found). Clients that advertise
/// `capabilities.tasks.requests.sampling.createMessage` or
/// `capabilities.tasks.requests.elicitation.create` must override this.
fn get_task_info(
&self,
request: GetTaskInfoParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<GetTaskResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<GetTaskInfoMethod>()))
}

/// Handle a `tasks/result` request from a server. Only relevant when
/// the client is also a task *receiver*.
///
/// # Default Behavior
/// Returns `-32601` (Method not found).
fn get_task_result(
&self,
request: GetTaskResultParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<GetTaskPayloadResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<GetTaskResultMethod>()))
}

/// Handle a `tasks/delete` request from a server (SEP-1686 §3.6).
/// Only relevant when the client is also a task *receiver*.
///
/// # Default Behavior
/// Returns `-32601` (Method not found). Task receivers must override this
/// to delete the task and any associated stored result.
fn delete_task(
&self,
request: DeleteTaskParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<DeleteTaskMethod>()))
}

fn on_cancelled(
&self,
params: CancelledNotificationParam,
Expand DownExpand Up@@ -310,6 +388,38 @@ macro_rules! impl_client_handler_for_wrapper {
(**self).on_custom_request(request, context)
}

fn list_tasks(
&self,
request: Option<PaginatedRequestParams>,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<ListTasksResult, McpError>> + MaybeSendFuture + '_ {
(**self).list_tasks(request, context)
}

fn get_task_info(
&self,
request: GetTaskInfoParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<GetTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).get_task_info(request, context)
}

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

fn delete_task(
&self,
request: DeleteTaskParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).delete_task(request, context)
}

fn on_cancelled(
&self,
params: CancelledNotificationParam,
Expand Down
22 changes: 11 additions & 11 deletions crates/rmcp/src/handler/server.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,10 +125,10 @@ impl<H: ServerHandler> Service<RoleServer> for H {
.get_task_result(request.params, context)
.await
.map(ServerResult::GetTaskPayloadResult),
ClientRequest::CancelTaskRequest(request) => self
.cancel_task(request.params, context)
ClientRequest::DeleteTaskRequest(request) => self
.delete_task(request.params, context)
.await
.map(ServerResult::CancelTaskResult),
.map(ServerResult::DeleteTaskResult),
};
// SEP-2164: peers negotiating 2026-07-28+ get the standard INVALID_PARAMS code for
// resource-not-found; older peers keep RESOURCE_NOT_FOUND. ISO `YYYY-MM-DD` versions
Expand DownExpand Up@@ -398,13 +398,13 @@ macro_rules! server_handler_methods {
std::future::ready(Err(McpError::method_not_found::<GetTaskResultMethod>()))
}

fn cancel_task(
fn delete_task(
&self,
request: CancelTaskParams,
request: DeleteTaskParams,
context: RequestContext<RoleServer>,
) -> impl Future<Output = Result<CancelTaskResult, McpError>> + MaybeSendFuture + '_ {
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<CancelTaskMethod>()))
std::future::ready(Err(McpError::method_not_found::<DeleteTaskMethod>()))
}
};
}
Expand DownExpand Up@@ -614,12 +614,12 @@ macro_rules! impl_server_handler_for_wrapper {
(**self).get_task_result(request, context)
}

fn cancel_task(
fn delete_task(
&self,
request: CancelTaskParams,
request: DeleteTaskParams,
context: RequestContext<RoleServer>,
) -> impl Future<Output = Result<CancelTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).cancel_task(request, context)
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).delete_task(request, context)
}
}
};
Expand Down
42 changes: 31 additions & 11 deletions crates/rmcp/src/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -3213,32 +3213,28 @@ impl RequestParamsMeta for GetTaskResultParams {
#[deprecated(since = "0.13.0", note = "Use GetTaskResultParams instead")]
pub type GetTaskResultParam = GetTaskResultParams;

const_string!(CancelTaskMethod = "tasks/cancel");
pub type CancelTaskRequest = Request<CancelTaskMethod, CancelTaskParams>;
const_string!(DeleteTaskMethod = "tasks/delete");
pub type DeleteTaskRequest = Request<DeleteTaskMethod, DeleteTaskParams>;

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct CancelTaskParams {
pub struct DeleteTaskParams {
/// Protocol-level metadata for this request (SEP-1319)
#[serde(rename = "_meta", default, skip_serializing_if = "Option::is_none")]
pub meta: Option<Meta>,
pub task_id: String,
}

impl RequestParamsMeta for CancelTaskParams {
impl RequestParamsMeta for DeleteTaskParams {
fn meta(&self) -> Option<&Meta> {
self.meta.as_ref()
}
fn meta_mut(&mut self) -> &mut Option<Meta> {
&mut self.meta
}
}

/// Deprecated: Use [`CancelTaskParams`] instead (SEP-1319 compliance).
#[deprecated(since = "0.13.0", note = "Use CancelTaskParams instead")]
pub type CancelTaskParam = CancelTaskParams;
/// Deprecated: Use [`GetTaskResult`] instead (spec alignment).
#[deprecated(since = "0.15.0", note = "Use GetTaskResult instead")]
pub type GetTaskInfoResult = GetTaskResult;
Expand DownExpand Up@@ -3338,7 +3334,7 @@ ts_union!(
| GetTaskInfoRequest
| ListTasksRequest
| GetTaskResultRequest
| CancelTaskRequest
| DeleteTaskRequest
| CustomRequest;
);

Expand All@@ -3361,7 +3357,7 @@ impl ClientRequest {
ClientRequest::GetTaskInfoRequest(r) => r.method.as_str(),
ClientRequest::ListTasksRequest(r) => r.method.as_str(),
ClientRequest::GetTaskResultRequest(r) => r.method.as_str(),
ClientRequest::CancelTaskRequest(r) => r.method.as_str(),
ClientRequest::DeleteTaskRequest(r) => r.method.as_str(),
ClientRequest::CustomRequest(r) => r.method.as_str(),
}
}
Expand All@@ -3381,6 +3377,10 @@ ts_union!(
box CreateMessageResult
| ListRootsResult
| CreateElicitationResult
| ListTasksResult
| GetTaskResult
| GetTaskPayloadResult
| DeleteTaskResult
| EmptyResult
| CustomResult;
);
Expand All@@ -3399,9 +3399,29 @@ ts_union!(
| CreateMessageRequest
| ListRootsRequest
| CreateElicitationRequest
| GetTaskInfoRequest
| ListTasksRequest
| GetTaskResultRequest
| DeleteTaskRequest
| CustomRequest;
);

impl ServerRequest {
pub fn method(&self) -> &str {
match &self {
ServerRequest::PingRequest(r) => r.method.as_str(),
ServerRequest::CreateMessageRequest(r) => r.method.as_str(),
ServerRequest::ListRootsRequest(r) => r.method.as_str(),
ServerRequest::CreateElicitationRequest(r) => r.method.as_str(),
ServerRequest::GetTaskInfoRequest(r) => r.method.as_str(),
ServerRequest::ListTasksRequest(r) => r.method.as_str(),
ServerRequest::GetTaskResultRequest(r) => r.method.as_str(),
ServerRequest::DeleteTaskRequest(r) => r.method.as_str(),
ServerRequest::CustomRequest(r) => r.method.as_str(),
}
}
}

ts_union!(
export type ServerNotification =
| CancelledNotification
Expand DownExpand Up@@ -3429,7 +3449,7 @@ ts_union!(
| CreateTaskResult
| ListTasksResult
| GetTaskResult
| CancelTaskResult
| DeleteTaskResult
| CallToolResult
| GetTaskPayloadResult
| EmptyResult
Expand Down
6 changes: 5 additions & 1 deletion crates/rmcp/src/model/meta.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,7 +155,7 @@ variant_extension! {
GetTaskInfoRequest
ListTasksRequest
GetTaskResultRequest
CancelTaskRequest
DeleteTaskRequest
}
}

Expand All@@ -166,6 +166,10 @@ variant_extension! {
ListRootsRequest
CreateElicitationRequest
CustomRequest
GetTaskInfoRequest
ListTasksRequest
GetTaskResultRequest
DeleteTaskRequest
}
}

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 8 additions & 22 deletions crates/rmcp-macros/src/task_handler.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -223,38 +223,24 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
.push(syn::parse2::<ImplItem>(get_result_fn)?);
}

if !has_method("cancel_task", &item_impl) {
let cancel_fn = quote! {
async fn cancel_task(
if !has_method("delete_task", &item_impl) {
let delete_fn = quote! {
async fn delete_task(
&self,
request: rmcp::model::CancelTaskParams,
request: rmcp::model::DeleteTaskParams,
_context: rmcp::service::RequestContext<rmcp::RoleServer>,
) -> Result<rmcp::model::CancelTaskResult, McpError> {
use rmcp::task_manager::current_timestamp;
) -> Result<rmcp::model::DeleteTaskResult, McpError> {
let task_id = request.task_id;
let mut processor = (#processor).lock().await;

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

// If already completed, signal it's not cancellable
let exists_completed = processor.peek_completed().iter().any(|r| r.descriptor.operation_id == task_id);
if exists_completed {
return Err(McpError::invalid_request(format!("task already completed: {}", task_id), None));
if processor.delete_task(&task_id) {
return Ok(rmcp::model::DeleteTaskResult { meta: None });
}

Err(McpError::resource_not_found(format!("task not found: {}", task_id), None))
}
};
item_impl.items.push(syn::parse2::<ImplItem>(cancel_fn)?);
item_impl.items.push(syn::parse2::<ImplItem>(delete_fn)?);
}

// Auto-generate get_info() if not already provided and no sibling tool/prompt handler
Expand Down
15 changes: 15 additions & 0 deletions crates/rmcp/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,16 @@ features = [
]
rustdoc-args = ["--cfg", "docsrs"]

# The protocol message unions in `model.rs` (`ClientRequest`, `ServerRequest`,
# `ClientResult`, `ServerResult`, …) are generated by `ts_union!` and are
# intentionally `#[non_exhaustive]`-free (see the `clippy::exhaustive_enums`
# expectation on the macro): each new spec revision adds message variants.
# Adding a variant is non-breaking for downstream consumers — the enums are
# `#[serde(untagged)]` and gain `From` impls — so `enum_variant_added` is
# expected churn rather than a true semver break.
[package.metadata.cargo-semver-checks.lints]
enum_variant_added = "allow"

[dependencies]
async-trait = "0.1.89"
serde = { version = "1.0", features = ["derive", "rc"] }
Expand DownExpand Up@@ -293,6 +303,11 @@ name = "test_custom_request"
required-features = ["server", "client"]
path = "tests/test_custom_request.rs"

[[test]]
name = "test_task_client_receiver"
required-features = ["server", "client"]
path = "tests/test_task_client_receiver.rs"

[[test]]
name = "test_prompt_macros"
required-features = ["server", "client"]
Expand Down
110 changes: 110 additions & 0 deletions crates/rmcp/src/handler/client.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,22 @@ impl<H: ClientHandler> Service<RoleClient> for H {
.create_elicitation(request.params, context)
.await
.map(ClientResult::CreateElicitationResult),
ServerRequest::ListTasksRequest(request) => self
.list_tasks(request.params, context)
.await
.map(ClientResult::ListTasksResult),
ServerRequest::GetTaskInfoRequest(request) => self
.get_task_info(request.params, context)
.await
.map(ClientResult::GetTaskResult),
ServerRequest::GetTaskResultRequest(request) => self
.get_task_result(request.params, context)
.await
.map(ClientResult::GetTaskPayloadResult),
ServerRequest::DeleteTaskRequest(request) => self
.delete_task(request.params, context)
.await
.map(ClientResult::DeleteTaskResult),
ServerRequest::CustomRequest(request) => self
.on_custom_request(request, context)
.await
Expand DownExpand Up@@ -191,6 +207,68 @@ pub trait ClientHandler: Sized + Send + Sync + 'static {
)))
}

/// Handle a `tasks/list` request from a server. Only relevant when the
/// client is also a task *receiver* (e.g. it accepted a task-augmented
/// `sampling/createMessage` or `elicitation/create` request).
///
/// # Default Behavior
/// Returns `-32601` (Method not found). Clients that advertise
/// `capabilities.tasks.list` must override this.
fn list_tasks(
&self,
request: Option<PaginatedRequestParams>,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<ListTasksResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<ListTasksMethod>()))
}

/// Handle a `tasks/get` request from a server. Only relevant when the
/// client is also a task *receiver* (e.g. it accepted a task-augmented
/// `sampling/createMessage` or `elicitation/create` request).
///
/// # Default Behavior
/// Returns `-32601` (Method not found). Clients that advertise
/// `capabilities.tasks.requests.sampling.createMessage` or
/// `capabilities.tasks.requests.elicitation.create` must override this.
fn get_task_info(
&self,
request: GetTaskInfoParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<GetTaskResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<GetTaskInfoMethod>()))
}

/// Handle a `tasks/result` request from a server. Only relevant when
/// the client is also a task *receiver*.
///
/// # Default Behavior
/// Returns `-32601` (Method not found).
fn get_task_result(
&self,
request: GetTaskResultParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<GetTaskPayloadResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<GetTaskResultMethod>()))
}

/// Handle a `tasks/delete` request from a server (SEP-1686 §3.6).
/// Only relevant when the client is also a task *receiver*.
///
/// # Default Behavior
/// Returns `-32601` (Method not found). Task receivers must override this
/// to delete the task and any associated stored result.
fn delete_task(
&self,
request: DeleteTaskParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<DeleteTaskMethod>()))
}

fn on_cancelled(
&self,
params: CancelledNotificationParam,
Expand DownExpand Up@@ -310,6 +388,38 @@ macro_rules! impl_client_handler_for_wrapper {
(**self).on_custom_request(request, context)
}

fn list_tasks(
&self,
request: Option<PaginatedRequestParams>,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<ListTasksResult, McpError>> + MaybeSendFuture + '_ {
(**self).list_tasks(request, context)
}

fn get_task_info(
&self,
request: GetTaskInfoParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<GetTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).get_task_info(request, context)
}

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

fn delete_task(
&self,
request: DeleteTaskParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).delete_task(request, context)
}

fn on_cancelled(
&self,
params: CancelledNotificationParam,
Expand Down
22 changes: 11 additions & 11 deletions crates/rmcp/src/handler/server.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,10 +125,10 @@ impl<H: ServerHandler> Service<RoleServer> for H {
.get_task_result(request.params, context)
.await
.map(ServerResult::GetTaskPayloadResult),
ClientRequest::CancelTaskRequest(request) => self
.cancel_task(request.params, context)
ClientRequest::DeleteTaskRequest(request) => self
.delete_task(request.params, context)
.await
.map(ServerResult::CancelTaskResult),
.map(ServerResult::DeleteTaskResult),
};
// SEP-2164: peers negotiating 2026-07-28+ get the standard INVALID_PARAMS code for
// resource-not-found; older peers keep RESOURCE_NOT_FOUND. ISO `YYYY-MM-DD` versions
Expand DownExpand Up@@ -398,13 +398,13 @@ macro_rules! server_handler_methods {
std::future::ready(Err(McpError::method_not_found::<GetTaskResultMethod>()))
}

fn cancel_task(
fn delete_task(
&self,
request: CancelTaskParams,
request: DeleteTaskParams,
context: RequestContext<RoleServer>,
) -> impl Future<Output = Result<CancelTaskResult, McpError>> + MaybeSendFuture + '_ {
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<CancelTaskMethod>()))
std::future::ready(Err(McpError::method_not_found::<DeleteTaskMethod>()))
}
};
}
Expand DownExpand Up@@ -614,12 +614,12 @@ macro_rules! impl_server_handler_for_wrapper {
(**self).get_task_result(request, context)
}

fn cancel_task(
fn delete_task(
&self,
request: CancelTaskParams,
request: DeleteTaskParams,
context: RequestContext<RoleServer>,
) -> impl Future<Output = Result<CancelTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).cancel_task(request, context)
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).delete_task(request, context)
}
}
};
Expand Down
42 changes: 31 additions & 11 deletions crates/rmcp/src/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -3213,32 +3213,28 @@ impl RequestParamsMeta for GetTaskResultParams {
#[deprecated(since = "0.13.0", note = "Use GetTaskResultParams instead")]
pub type GetTaskResultParam = GetTaskResultParams;

const_string!(CancelTaskMethod = "tasks/cancel");
pub type CancelTaskRequest = Request<CancelTaskMethod, CancelTaskParams>;
const_string!(DeleteTaskMethod = "tasks/delete");
pub type DeleteTaskRequest = Request<DeleteTaskMethod, DeleteTaskParams>;

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct CancelTaskParams {
pub struct DeleteTaskParams {
/// Protocol-level metadata for this request (SEP-1319)
#[serde(rename = "_meta", default, skip_serializing_if = "Option::is_none")]
pub meta: Option<Meta>,
pub task_id: String,
}

impl RequestParamsMeta for CancelTaskParams {
impl RequestParamsMeta for DeleteTaskParams {
fn meta(&self) -> Option<&Meta> {
self.meta.as_ref()
}
fn meta_mut(&mut self) -> &mut Option<Meta> {
&mut self.meta
}
}

/// Deprecated: Use [`CancelTaskParams`] instead (SEP-1319 compliance).
#[deprecated(since = "0.13.0", note = "Use CancelTaskParams instead")]
pub type CancelTaskParam = CancelTaskParams;
/// Deprecated: Use [`GetTaskResult`] instead (spec alignment).
#[deprecated(since = "0.15.0", note = "Use GetTaskResult instead")]
pub type GetTaskInfoResult = GetTaskResult;
Expand DownExpand Up@@ -3338,7 +3334,7 @@ ts_union!(
| GetTaskInfoRequest
| ListTasksRequest
| GetTaskResultRequest
| CancelTaskRequest
| DeleteTaskRequest
| CustomRequest;
);

Expand All@@ -3361,7 +3357,7 @@ impl ClientRequest {
ClientRequest::GetTaskInfoRequest(r) => r.method.as_str(),
ClientRequest::ListTasksRequest(r) => r.method.as_str(),
ClientRequest::GetTaskResultRequest(r) => r.method.as_str(),
ClientRequest::CancelTaskRequest(r) => r.method.as_str(),
ClientRequest::DeleteTaskRequest(r) => r.method.as_str(),
ClientRequest::CustomRequest(r) => r.method.as_str(),
}
}
Expand All@@ -3381,6 +3377,10 @@ ts_union!(
box CreateMessageResult
| ListRootsResult
| CreateElicitationResult
| ListTasksResult
| GetTaskResult
| GetTaskPayloadResult
| DeleteTaskResult
| EmptyResult
| CustomResult;
);
Expand All@@ -3399,9 +3399,29 @@ ts_union!(
| CreateMessageRequest
| ListRootsRequest
| CreateElicitationRequest
| GetTaskInfoRequest
| ListTasksRequest
| GetTaskResultRequest
| DeleteTaskRequest
| CustomRequest;
);

impl ServerRequest {
pub fn method(&self) -> &str {
match &self {
ServerRequest::PingRequest(r) => r.method.as_str(),
ServerRequest::CreateMessageRequest(r) => r.method.as_str(),
ServerRequest::ListRootsRequest(r) => r.method.as_str(),
ServerRequest::CreateElicitationRequest(r) => r.method.as_str(),
ServerRequest::GetTaskInfoRequest(r) => r.method.as_str(),
ServerRequest::ListTasksRequest(r) => r.method.as_str(),
ServerRequest::GetTaskResultRequest(r) => r.method.as_str(),
ServerRequest::DeleteTaskRequest(r) => r.method.as_str(),
ServerRequest::CustomRequest(r) => r.method.as_str(),
}
}
}

ts_union!(
export type ServerNotification =
| CancelledNotification
Expand DownExpand Up@@ -3429,7 +3449,7 @@ ts_union!(
| CreateTaskResult
| ListTasksResult
| GetTaskResult
| CancelTaskResult
| DeleteTaskResult
| CallToolResult
| GetTaskPayloadResult
| EmptyResult
Expand Down
6 changes: 5 additions & 1 deletion crates/rmcp/src/model/meta.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,7 +155,7 @@ variant_extension! {
GetTaskInfoRequest
ListTasksRequest
GetTaskResultRequest
CancelTaskRequest
DeleteTaskRequest
}
}

Expand All@@ -166,6 +166,10 @@ variant_extension! {
ListRootsRequest
CreateElicitationRequest
CustomRequest
GetTaskInfoRequest
ListTasksRequest
GetTaskResultRequest
DeleteTaskRequest
}
}

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 8 additions & 22 deletions crates/rmcp-macros/src/task_handler.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -223,38 +223,24 @@ pub fn task_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
.push(syn::parse2::<ImplItem>(get_result_fn)?);
}

if !has_method("cancel_task", &item_impl) {
let cancel_fn = quote! {
async fn cancel_task(
if !has_method("delete_task", &item_impl) {
let delete_fn = quote! {
async fn delete_task(
&self,
request: rmcp::model::CancelTaskParams,
request: rmcp::model::DeleteTaskParams,
_context: rmcp::service::RequestContext<rmcp::RoleServer>,
) -> Result<rmcp::model::CancelTaskResult, McpError> {
use rmcp::task_manager::current_timestamp;
) -> Result<rmcp::model::DeleteTaskResult, McpError> {
let task_id = request.task_id;
let mut processor = (#processor).lock().await;

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

// If already completed, signal it's not cancellable
let exists_completed = processor.peek_completed().iter().any(|r| r.descriptor.operation_id == task_id);
if exists_completed {
return Err(McpError::invalid_request(format!("task already completed: {}", task_id), None));
if processor.delete_task(&task_id) {
return Ok(rmcp::model::DeleteTaskResult { meta: None });
}

Err(McpError::resource_not_found(format!("task not found: {}", task_id), None))
}
};
item_impl.items.push(syn::parse2::<ImplItem>(cancel_fn)?);
item_impl.items.push(syn::parse2::<ImplItem>(delete_fn)?);
}

// Auto-generate get_info() if not already provided and no sibling tool/prompt handler
Expand Down
15 changes: 15 additions & 0 deletions crates/rmcp/Cargo.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,16 @@ features = [
]
rustdoc-args = ["--cfg", "docsrs"]

# The protocol message unions in `model.rs` (`ClientRequest`, `ServerRequest`,
# `ClientResult`, `ServerResult`, …) are generated by `ts_union!` and are
# intentionally `#[non_exhaustive]`-free (see the `clippy::exhaustive_enums`
# expectation on the macro): each new spec revision adds message variants.
# Adding a variant is non-breaking for downstream consumers — the enums are
# `#[serde(untagged)]` and gain `From` impls — so `enum_variant_added` is
# expected churn rather than a true semver break.
[package.metadata.cargo-semver-checks.lints]
enum_variant_added = "allow"

[dependencies]
async-trait = "0.1.89"
serde = { version = "1.0", features = ["derive", "rc"] }
Expand DownExpand Up@@ -293,6 +303,11 @@ name = "test_custom_request"
required-features = ["server", "client"]
path = "tests/test_custom_request.rs"

[[test]]
name = "test_task_client_receiver"
required-features = ["server", "client"]
path = "tests/test_task_client_receiver.rs"

[[test]]
name = "test_prompt_macros"
required-features = ["server", "client"]
Expand Down
110 changes: 110 additions & 0 deletions crates/rmcp/src/handler/client.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,22 @@ impl<H: ClientHandler> Service<RoleClient> for H {
.create_elicitation(request.params, context)
.await
.map(ClientResult::CreateElicitationResult),
ServerRequest::ListTasksRequest(request) => self
.list_tasks(request.params, context)
.await
.map(ClientResult::ListTasksResult),
ServerRequest::GetTaskInfoRequest(request) => self
.get_task_info(request.params, context)
.await
.map(ClientResult::GetTaskResult),
ServerRequest::GetTaskResultRequest(request) => self
.get_task_result(request.params, context)
.await
.map(ClientResult::GetTaskPayloadResult),
ServerRequest::DeleteTaskRequest(request) => self
.delete_task(request.params, context)
.await
.map(ClientResult::DeleteTaskResult),
ServerRequest::CustomRequest(request) => self
.on_custom_request(request, context)
.await
Expand DownExpand Up@@ -191,6 +207,68 @@ pub trait ClientHandler: Sized + Send + Sync + 'static {
)))
}

/// Handle a `tasks/list` request from a server. Only relevant when the
/// client is also a task *receiver* (e.g. it accepted a task-augmented
/// `sampling/createMessage` or `elicitation/create` request).
///
/// # Default Behavior
/// Returns `-32601` (Method not found). Clients that advertise
/// `capabilities.tasks.list` must override this.
fn list_tasks(
&self,
request: Option<PaginatedRequestParams>,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<ListTasksResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<ListTasksMethod>()))
}

/// Handle a `tasks/get` request from a server. Only relevant when the
/// client is also a task *receiver* (e.g. it accepted a task-augmented
/// `sampling/createMessage` or `elicitation/create` request).
///
/// # Default Behavior
/// Returns `-32601` (Method not found). Clients that advertise
/// `capabilities.tasks.requests.sampling.createMessage` or
/// `capabilities.tasks.requests.elicitation.create` must override this.
fn get_task_info(
&self,
request: GetTaskInfoParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<GetTaskResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<GetTaskInfoMethod>()))
}

/// Handle a `tasks/result` request from a server. Only relevant when
/// the client is also a task *receiver*.
///
/// # Default Behavior
/// Returns `-32601` (Method not found).
fn get_task_result(
&self,
request: GetTaskResultParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<GetTaskPayloadResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<GetTaskResultMethod>()))
}

/// Handle a `tasks/delete` request from a server (SEP-1686 §3.6).
/// Only relevant when the client is also a task *receiver*.
///
/// # Default Behavior
/// Returns `-32601` (Method not found). Task receivers must override this
/// to delete the task and any associated stored result.
fn delete_task(
&self,
request: DeleteTaskParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<DeleteTaskMethod>()))
}

fn on_cancelled(
&self,
params: CancelledNotificationParam,
Expand DownExpand Up@@ -310,6 +388,38 @@ macro_rules! impl_client_handler_for_wrapper {
(**self).on_custom_request(request, context)
}

fn list_tasks(
&self,
request: Option<PaginatedRequestParams>,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<ListTasksResult, McpError>> + MaybeSendFuture + '_ {
(**self).list_tasks(request, context)
}

fn get_task_info(
&self,
request: GetTaskInfoParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<GetTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).get_task_info(request, context)
}

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

fn delete_task(
&self,
request: DeleteTaskParams,
context: RequestContext<RoleClient>,
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).delete_task(request, context)
}

fn on_cancelled(
&self,
params: CancelledNotificationParam,
Expand Down
22 changes: 11 additions & 11 deletions crates/rmcp/src/handler/server.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,10 +125,10 @@ impl<H: ServerHandler> Service<RoleServer> for H {
.get_task_result(request.params, context)
.await
.map(ServerResult::GetTaskPayloadResult),
ClientRequest::CancelTaskRequest(request) => self
.cancel_task(request.params, context)
ClientRequest::DeleteTaskRequest(request) => self
.delete_task(request.params, context)
.await
.map(ServerResult::CancelTaskResult),
.map(ServerResult::DeleteTaskResult),
};
// SEP-2164: peers negotiating 2026-07-28+ get the standard INVALID_PARAMS code for
// resource-not-found; older peers keep RESOURCE_NOT_FOUND. ISO `YYYY-MM-DD` versions
Expand DownExpand Up@@ -398,13 +398,13 @@ macro_rules! server_handler_methods {
std::future::ready(Err(McpError::method_not_found::<GetTaskResultMethod>()))
}

fn cancel_task(
fn delete_task(
&self,
request: CancelTaskParams,
request: DeleteTaskParams,
context: RequestContext<RoleServer>,
) -> impl Future<Output = Result<CancelTaskResult, McpError>> + MaybeSendFuture + '_ {
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
let _ = (request, context);
std::future::ready(Err(McpError::method_not_found::<CancelTaskMethod>()))
std::future::ready(Err(McpError::method_not_found::<DeleteTaskMethod>()))
}
};
}
Expand DownExpand Up@@ -614,12 +614,12 @@ macro_rules! impl_server_handler_for_wrapper {
(**self).get_task_result(request, context)
}

fn cancel_task(
fn delete_task(
&self,
request: CancelTaskParams,
request: DeleteTaskParams,
context: RequestContext<RoleServer>,
) -> impl Future<Output = Result<CancelTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).cancel_task(request, context)
) -> impl Future<Output = Result<DeleteTaskResult, McpError>> + MaybeSendFuture + '_ {
(**self).delete_task(request, context)
}
}
};
Expand Down
42 changes: 31 additions & 11 deletions crates/rmcp/src/model.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -3213,32 +3213,28 @@ impl RequestParamsMeta for GetTaskResultParams {
#[deprecated(since = "0.13.0", note = "Use GetTaskResultParams instead")]
pub type GetTaskResultParam = GetTaskResultParams;

const_string!(CancelTaskMethod = "tasks/cancel");
pub type CancelTaskRequest = Request<CancelTaskMethod, CancelTaskParams>;
const_string!(DeleteTaskMethod = "tasks/delete");
pub type DeleteTaskRequest = Request<DeleteTaskMethod, DeleteTaskParams>;

#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
#[expect(clippy::exhaustive_structs, reason = "intentionally exhaustive")]
pub struct CancelTaskParams {
pub struct DeleteTaskParams {
/// Protocol-level metadata for this request (SEP-1319)
#[serde(rename = "_meta", default, skip_serializing_if = "Option::is_none")]
pub meta: Option<Meta>,
pub task_id: String,
}

impl RequestParamsMeta for CancelTaskParams {
impl RequestParamsMeta for DeleteTaskParams {
fn meta(&self) -> Option<&Meta> {
self.meta.as_ref()
}
fn meta_mut(&mut self) -> &mut Option<Meta> {
&mut self.meta
}
}

/// Deprecated: Use [`CancelTaskParams`] instead (SEP-1319 compliance).
#[deprecated(since = "0.13.0", note = "Use CancelTaskParams instead")]
pub type CancelTaskParam = CancelTaskParams;
/// Deprecated: Use [`GetTaskResult`] instead (spec alignment).
#[deprecated(since = "0.15.0", note = "Use GetTaskResult instead")]
pub type GetTaskInfoResult = GetTaskResult;
Expand DownExpand Up@@ -3338,7 +3334,7 @@ ts_union!(
| GetTaskInfoRequest
| ListTasksRequest
| GetTaskResultRequest
| CancelTaskRequest
| DeleteTaskRequest
| CustomRequest;
);

Expand All@@ -3361,7 +3357,7 @@ impl ClientRequest {
ClientRequest::GetTaskInfoRequest(r) => r.method.as_str(),
ClientRequest::ListTasksRequest(r) => r.method.as_str(),
ClientRequest::GetTaskResultRequest(r) => r.method.as_str(),
ClientRequest::CancelTaskRequest(r) => r.method.as_str(),
ClientRequest::DeleteTaskRequest(r) => r.method.as_str(),
ClientRequest::CustomRequest(r) => r.method.as_str(),
}
}
Expand All@@ -3381,6 +3377,10 @@ ts_union!(
box CreateMessageResult
| ListRootsResult
| CreateElicitationResult
| ListTasksResult
| GetTaskResult
| GetTaskPayloadResult
| DeleteTaskResult
| EmptyResult
| CustomResult;
);
Expand All@@ -3399,9 +3399,29 @@ ts_union!(
| CreateMessageRequest
| ListRootsRequest
| CreateElicitationRequest
| GetTaskInfoRequest
| ListTasksRequest
| GetTaskResultRequest
| DeleteTaskRequest
| CustomRequest;
);

impl ServerRequest {
pub fn method(&self) -> &str {
match &self {
ServerRequest::PingRequest(r) => r.method.as_str(),
ServerRequest::CreateMessageRequest(r) => r.method.as_str(),
ServerRequest::ListRootsRequest(r) => r.method.as_str(),
ServerRequest::CreateElicitationRequest(r) => r.method.as_str(),
ServerRequest::GetTaskInfoRequest(r) => r.method.as_str(),
ServerRequest::ListTasksRequest(r) => r.method.as_str(),
ServerRequest::GetTaskResultRequest(r) => r.method.as_str(),
ServerRequest::DeleteTaskRequest(r) => r.method.as_str(),
ServerRequest::CustomRequest(r) => r.method.as_str(),
}
}
}

ts_union!(
export type ServerNotification =
| CancelledNotification
Expand DownExpand Up@@ -3429,7 +3449,7 @@ ts_union!(
| CreateTaskResult
| ListTasksResult
| GetTaskResult
| CancelTaskResult
| DeleteTaskResult
| CallToolResult
| GetTaskPayloadResult
| EmptyResult
Expand Down
6 changes: 5 additions & 1 deletion crates/rmcp/src/model/meta.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,7 +155,7 @@ variant_extension! {
GetTaskInfoRequest
ListTasksRequest
GetTaskResultRequest
CancelTaskRequest
DeleteTaskRequest
}
}

Expand All@@ -166,6 +166,10 @@ variant_extension! {
ListRootsRequest
CreateElicitationRequest
CustomRequest
GetTaskInfoRequest
ListTasksRequest
GetTaskResultRequest
DeleteTaskRequest
}
}

Expand Down
Loading
Loading