Skip to content

Add MCP proxy server support for prompts #1004

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
adwsingh merged 1 commit into from
Jan 7, 2026
Merged

Add MCP proxy server support for prompts #1004

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions mcp/mcp-server/src/main/java/software/amazon/smithy/java/mcp/server/McpService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,19 @@ private JsonRpcResponse handleInitialize(JsonRpcRequest req) {
}

private JsonRpcResponse handlePromptsList(JsonRpcRequest req) {
var allPrompts = new ArrayList<>(prompts.values().stream().map(Prompt::promptInfo).toList());

// Add prompts from proxy servers
for (McpServerProxy proxy : proxies.values()) {
var response = proxy.rpc(req).join();
if (response.getError() == null) {
var proxyPrompts = response.getResult().asShape(ListPromptsResult.builder()).getPrompts();
allPrompts.addAll(proxyPrompts);
}
}

var result = ListPromptsResult.builder()
.prompts(prompts.values().stream().map(Prompt::promptInfo).toList())
.prompts(allPrompts)
.build();
return createSuccessResponse(req.getId(), result);
}
Expand All @@ -232,12 +243,12 @@ private JsonRpcResponse handlePromptsGet(JsonRpcRequest req) {

var prompt = prompts.get(normalize(promptName));

if (prompt == null) {
throw new RuntimeException("Prompt not found: " + promptName);
if (prompt != null) {
var result = promptProcessor.buildPromptResult(prompt, promptArguments);
return createSuccessResponse(req.getId(), result);
}

var result = promptProcessor.buildPromptResult(prompt, promptArguments);
return createSuccessResponse(req.getId(), result);
throw new RuntimeException("Prompt not found: " + promptName);
}

private JsonRpcResponse handleToolsList(JsonRpcRequest req, ProtocolVersion protocolVersion) {
Expand Down