Skip to content

feat: pass headers while init mcp client #247

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
copybara-service merged 1 commit into from
Jul 14, 2025
+22 −4
Merged

feat: pass headers while init mcp client #247

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
26 changes: 22 additions & 4 deletions core/src/main/java/com/google/adk/tools/mcp/McpSessionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,22 @@

package com.google.adk.tools.mcp;

import com.google.common.collect.ImmutableMap;
import io.modelcontextprotocol.client.McpClient;
import io.modelcontextprotocol.client.McpSyncClient;
import io.modelcontextprotocol.client.transport.HttpClientSseClientTransport;
import io.modelcontextprotocol.client.transport.ServerParameters; // Server Parameters for stdio.
import io.modelcontextprotocol.client.transport.ServerParameters;
import io.modelcontextprotocol.client.transport.StdioClientTransport;
import io.modelcontextprotocol.spec.McpClientTransport;
import io.modelcontextprotocol.spec.McpSchema.ClientCapabilities;
import io.modelcontextprotocol.spec.McpSchema.InitializeResult;
import java.time.Duration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.time.Duration;
import java.util.Collection;
import java.util.Optional;

/**
* Manages MCP client sessions.
*
Expand All @@ -53,8 +57,22 @@ public static McpSyncClient initializeSession(Object connectionParams) {
if (connectionParams instanceof ServerParameters serverParameters) {
transport = new StdioClientTransport(serverParameters);
} else if (connectionParams instanceof SseServerParameters sseServerParams) {
transport =
HttpClientSseClientTransport.builder(sseServerParams.url()).sseEndpoint("sse").build();
transport = HttpClientSseClientTransport.builder(sseServerParams.url())
.sseEndpoint("sse")
.customizeRequest(builder ->
Optional.ofNullable(sseServerParams.headers())
.map(ImmutableMap::entrySet)
.stream().flatMap(Collection::stream)
.forEach(entry ->
builder.header(
entry.getKey(),
Optional.ofNullable(entry.getValue())
.map(Object::toString)
.orElse("")
)
)
)
.build();
} else {
throw new IllegalArgumentException(
"Connection parameters must be either ServerParameters or SseServerParameters, but got "
Expand Down