Skip to content

Add ttlMs and cacheScope to cacheable result records (SEP-2549) #1062

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
aboullaite wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add ttlMs and cacheScope to cacheable result records (SEP-2549) #1062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c25b7c
Add ttlMs and cacheScope to cacheable result records (SEP-2549)
Jul 16, 2026
64a3659
Stamp default ttlMs and cacheScope on server responses (SEP-2549)
Jul 17, 2026
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
34 changes: 29 additions & 5 deletions mcp-core/src/main/java/io/modelcontextprotocol/server/McpAsyncServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,10 @@ private McpRequestHandler<McpSchema.ListToolsResult> toolsListRequestHandler() {
return (exchange, params) -> {
List<Tool> tools = this.tools.stream().map(McpServerFeatures.AsyncToolSpecification::tool).toList();

return Mono.just(McpSchema.ListToolsResult.builder(tools).build());
return Mono.just(McpSchema.ListToolsResult.builder(tools)
.ttlMs(0)
.cacheScope(McpSchema.CacheScope.PUBLIC)
.build());
};
}

Expand Down Expand Up @@ -791,7 +794,10 @@ private McpRequestHandler<McpSchema.ListResourcesResult> resourcesListRequestHan
.stream()
.map(McpServerFeatures.AsyncResourceSpecification::resource)
.toList();
return Mono.just(McpSchema.ListResourcesResult.builder(resourceList).build());
return Mono.just(McpSchema.ListResourcesResult.builder(resourceList)
.ttlMs(0)
.cacheScope(McpSchema.CacheScope.PUBLIC)
.build());
};
}

Expand All @@ -801,7 +807,10 @@ private McpRequestHandler<McpSchema.ListResourceTemplatesResult> resourceTemplat
.stream()
.map(McpServerFeatures.AsyncResourceTemplateSpecification::resourceTemplate)
.toList();
return Mono.just(McpSchema.ListResourceTemplatesResult.builder(resourceList).build());
return Mono.just(McpSchema.ListResourceTemplatesResult.builder(resourceList)
.ttlMs(0)
.cacheScope(McpSchema.CacheScope.PUBLIC)
.build());
};
}

Expand All @@ -822,10 +831,22 @@ private McpRequestHandler<McpSchema.ReadResourceResult> resourcesReadRequestHand
return this.findResourceTemplateSpecification(resourceUri)
.map(spec -> spec.readHandler().apply(ex, resourceRequest))
.orElseGet(() -> Mono.error(RESOURCE_NOT_FOUND.apply(resourceUri)));
});
})
.map(McpAsyncServer::withCacheDefaults);
};
}

private static McpSchema.ReadResourceResult withCacheDefaults(McpSchema.ReadResourceResult result) {
if (result.ttlMs() == null || result.cacheScope() == null) {
return McpSchema.ReadResourceResult.builder(result.contents())
.meta(result.meta())
.ttlMs(result.ttlMs() != null ? result.ttlMs() : 0)
.cacheScope(result.cacheScope() != null ? result.cacheScope() : McpSchema.CacheScope.PUBLIC)
.build();
}
return result;
}

private Optional<McpServerFeatures.AsyncResourceSpecification> findResourceSpecification(String uri) {
var result = this.resources.values()
.stream()
Expand Down Expand Up @@ -952,7 +973,10 @@ private McpRequestHandler<McpSchema.ListPromptsResult> promptsListRequestHandler
.map(McpServerFeatures.AsyncPromptSpecification::prompt)
.toList();

return Mono.just(McpSchema.ListPromptsResult.builder(promptList).build());
return Mono.just(McpSchema.ListPromptsResult.builder(promptList)
.ttlMs(0)
.cacheScope(McpSchema.CacheScope.PUBLIC)
.build());
};
}

Expand Down
34 changes: 29 additions & 5 deletions mcp-core/src/main/java/io/modelcontextprotocol/server/McpStatelessAsyncServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,10 @@ private McpStatelessRequestHandler<McpSchema.ListToolsResult> toolsListRequestHa
List<Tool> tools = this.tools.stream()
.map(McpStatelessServerFeatures.AsyncToolSpecification::tool)
.toList();
return Mono.just(McpSchema.ListToolsResult.builder(tools).build());
return Mono.just(McpSchema.ListToolsResult.builder(tools)
.ttlMs(0)
.cacheScope(McpSchema.CacheScope.PUBLIC)
.build());
};
}

Expand Down Expand Up @@ -584,7 +587,10 @@ private McpStatelessRequestHandler<McpSchema.ListResourcesResult> resourcesListR
.stream()
.map(McpStatelessServerFeatures.AsyncResourceSpecification::resource)
.toList();
return Mono.just(McpSchema.ListResourcesResult.builder(resourceList).build());
return Mono.just(McpSchema.ListResourcesResult.builder(resourceList)
.ttlMs(0)
.cacheScope(McpSchema.CacheScope.PUBLIC)
.build());
};
}

Expand All @@ -594,7 +600,10 @@ private McpStatelessRequestHandler<McpSchema.ListResourceTemplatesResult> resour
.stream()
.map(AsyncResourceTemplateSpecification::resourceTemplate)
.toList();
return Mono.just(McpSchema.ListResourceTemplatesResult.builder(resourceList).build());
return Mono.just(McpSchema.ListResourceTemplatesResult.builder(resourceList)
.ttlMs(0)
.cacheScope(McpSchema.CacheScope.PUBLIC)
.build());
};
}

Expand All @@ -614,11 +623,23 @@ private McpStatelessRequestHandler<McpSchema.ReadResourceResult> resourcesReadRe
return this.findResourceTemplateSpecification(resourceUri)
.map(spec -> spec.readHandler().apply(ctx, resourceRequest))
.orElseGet(() -> Mono.error(RESOURCE_NOT_FOUND.apply(resourceUri)));
});
})
.map(McpStatelessAsyncServer::withCacheDefaults);

};
}

private static McpSchema.ReadResourceResult withCacheDefaults(McpSchema.ReadResourceResult result) {
if (result.ttlMs() == null || result.cacheScope() == null) {
return McpSchema.ReadResourceResult.builder(result.contents())
.meta(result.meta())
.ttlMs(result.ttlMs() != null ? result.ttlMs() : 0)
.cacheScope(result.cacheScope() != null ? result.cacheScope() : McpSchema.CacheScope.PUBLIC)
.build();
}
return result;
}

private Optional<McpStatelessServerFeatures.AsyncResourceSpecification> findResourceSpecification(String uri) {
var result = this.resources.values()
.stream()
Expand Down Expand Up @@ -714,7 +735,10 @@ private McpStatelessRequestHandler<McpSchema.ListPromptsResult> promptsListReque
.map(McpStatelessServerFeatures.AsyncPromptSpecification::prompt)
.toList();

return Mono.just(McpSchema.ListPromptsResult.builder(promptList).build());
return Mono.just(McpSchema.ListPromptsResult.builder(promptList)
.ttlMs(0)
.cacheScope(McpSchema.CacheScope.PUBLIC)
.build());
};
}

Expand Down
Loading