Skip to content

Commit f39387f

Browse files
authored
mcp tasks support (#2745)
* route task methods (get/update/cancel) * multiplex task IDs * enforce RBAC on task methods * thread task ID into Mcp-Name header * properly advertise the capability (don't strip it) fixes #2554 note this isn't well supported by the SDKs, it only last week made it into rust-sdk: * modelcontextprotocol/typescript-sdk#2189 * modelcontextprotocol/python-sdk#2806 so I don't think merging this is super urgent --------- Signed-off-by: Steven Landow <[email protected]>
1 parent 7cd5647 commit f39387f

11 files changed

Lines changed: 609 additions & 39 deletions

File tree

‎crates/agentgateway/src/cel/types.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2344,6 +2344,7 @@ pub fn full_example_executor() -> ExecutorSerde {
23442344
}),
23452345
prompt: None,
23462346
resource: None,
2347+
task: None,
23472348
}),
23482349
backend: Some(BackendContext {
23492350
name: "my-backend".into(),

‎crates/agentgateway/src/mcp/handler.rs‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,61 @@ pub(super) fn rewrite_resource_messages(
162162
message
163163
}
164164

165+
// Namespaces a task id as `<target>+<task id>`, mirroring `resource_uri`.
166+
fn task_id(default_target_name: Option<&String>, target: &str, task_id: &str) -> String {
167+
if default_target_name.is_none() {
168+
format!("{target}+{task_id}")
169+
} else {
170+
task_id.to_string()
171+
}
172+
}
173+
174+
// Rewrites task ids in outbound results/notifications so they round-trip through `parse_task_id`.
175+
pub(super) fn rewrite_task_messages(
176+
default_target_name: Option<&String>,
177+
target: &str,
178+
mut message: ServerJsonRpcMessage,
179+
) -> ServerJsonRpcMessage {
180+
if let ServerJsonRpcMessage::Response(resp) = &mut message {
181+
match &mut resp.result {
182+
ServerResult::CreateTaskResult(r) => {
183+
r.task.task_id = task_id(default_target_name, target, &r.task.task_id);
184+
},
185+
ServerResult::GetTaskResult(r) => {
186+
r.task.task.task_id = task_id(default_target_name, target, &r.task.task.task_id);
187+
},
188+
_ => {},
189+
}
190+
}
191+
if let ServerJsonRpcMessage::Notification(notification) = &mut message
192+
&& let ServerNotification::TaskStatusNotification(tsn) = &mut notification.notification
193+
{
194+
tsn.params.task.task.task_id =
195+
task_id(default_target_name, target, &tsn.params.task.task.task_id);
196+
}
197+
message
198+
}
199+
200+
// Reverse of `task_id`: splits `<target>+<task id>` into (target, task id).
201+
pub(super) fn parse_task_id<'a>(
202+
upstreams: &'a upstream::UpstreamGroup,
203+
task_id: &str,
204+
) -> Result<(&'a str, String), UpstreamError> {
205+
if let Some(default) = upstreams.default_target_name.as_ref() {
206+
Ok((default.as_str(), task_id.to_string()))
207+
} else {
208+
let plus_pos = task_id
209+
.find('+')
210+
.ok_or_else(|| UpstreamError::InvalidRequest("invalid task id".to_string()))?;
211+
let service_name = &task_id[..plus_pos];
212+
let original_id = &task_id[plus_pos + 1..];
213+
let validated_name = upstreams
214+
.get_name(service_name)
215+
.ok_or_else(|| UpstreamError::InvalidRequest(format!("unknown service {service_name}")))?;
216+
Ok((validated_name, original_id.to_string()))
217+
}
218+
}
219+
165220
/// What kind of name is being resolved to a target (`prefixMode: never`).
166221
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
167222
pub(crate) enum ResolveKind {
@@ -271,6 +326,7 @@ impl Relay {
271326
let policies = self.policies.clone();
272327
stream.map_server_messages(move |message| {
273328
let message = rewrite_resource_messages(default_target_name.as_ref(), &target, message);
329+
let message = rewrite_task_messages(default_target_name.as_ref(), &target, message);
274330

275331
let mut resource_allowed = |uri: &str| {
276332
// rewrite_tool_list_ui_meta extracts app URIs from tool metadata, apply RBAC against

0 commit comments

Comments
 (0)