Is there any sane way of using the MCP Prompts between the Client and Server?

[KaustubhKhati]

Hi,
I’m struggling to piece together how to seamlessly use the MCP Prompt from an MCP server to an MCP client, both using Spring AI 1.1.0.
The Problem
The server returns a GetPromptResult which contains a PromptMessage, but neither of these directly correlates to what a ChatClient expects.
The implementation also doesn’t make things easy.
The example shows:

@McpPrompt(
    name = "greeting",
    description = "Generate a greeting message")
public GetPromptResult greeting(
    @McpArg(name = "name", description = "User's name", required = true)
    String name) {

    String message = "Hello, " + name + "! How can I help you today?";

    return new GetPromptResult(
        "Greeting",
        List.of(new PromptMessage(Role.ASSISTANT, new TextContent(message)))
    );
}

However, to build the message string, it seems I can’t use the PromptTemplate or AssistantPromptTemplate directly.
Instead, I end up having to do something like:

    @McpPrompt(
        name = "greeting",
        description = "Generate a greeting message")
    public McpSchema.GetPromptResult greeting(
        @McpArg(name = "name", description = "User's name", required = true)
        String name) {
    
        String messageTemplate = "Hello, {name}! How can I help you today?";
        String message = PromptTemplate.builder()
            .template(messageTemplate)
            .variables(Map.of("name", name))
            .build()
            .create()
            .getContents();
    
        return new McpSchema.GetPromptResult(
            "Greeting",
            List.of(new McpSchema.PromptMessage(
                McpSchema.Role.USER,
                new McpSchema.TextContent(message)
            ))
        );
    }

Honestly, this feels unnecessarily complicated.
It would make more sense if the server just returned the prompt with placeholders to the client, and then let the client resolve and fill them.
But even that doesn’t seem straightforward.
Example client usage:

   McpSchema.GetPromptResult getPromptResult =
    mcpClients.getFirst().getPrompt(
        new McpSchema.GetPromptRequest("greeting", Map.of("name", "hell"))
    );

McpSchema.TextContent content =
    (McpSchema.TextContent) getPromptResult.messages().getFirst().content();

content.text();

I’d appreciate it if someone could point out if my current approach is completely wrong and suggest a better, more idiomatic way to handle this scenario.