Skip to content

Fix: the header information set by the client being lost. #686

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
ezynda3 merged 6 commits into from
Jan 7, 2026
Merged

Fix: the header information set by the client being lost. #686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
02251f9
Add header parameter to listByPage function
button-chen Dec 30, 2025
4b5b41a
Add header parameter to listByPage calls
button-chen Dec 30, 2025
5dc8471
Add test for ListTools with custom header
button-chen Jan 5, 2026
aa46634
Update mcptest_test.go
button-chen Jan 5, 2026
c16aef7
Update mcptest_test.go
button-chen Jan 5, 2026
75605de
Update mcptest_test.go
button-chen Jan 6, 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
11 changes: 6 additions & 5 deletions client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ func (c *Client) ListResourcesByPage(
ctx context.Context,
request mcp.ListResourcesRequest,
) (*mcp.ListResourcesResult, error) {
result, err := listByPage[mcp.ListResourcesResult](ctx, c, request.PaginatedRequest, "resources/list")
result, err := listByPage[mcp.ListResourcesResult](ctx, c, request.PaginatedRequest, request.Header, "resources/list")
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -303,7 +303,7 @@ func (c *Client) ListResourceTemplatesByPage(
ctx context.Context,
request mcp.ListResourceTemplatesRequest,
) (*mcp.ListResourceTemplatesResult, error) {
result, err := listByPage[mcp.ListResourceTemplatesResult](ctx, c, request.PaginatedRequest, "resources/templates/list")
result, err := listByPage[mcp.ListResourceTemplatesResult](ctx, c, request.PaginatedRequest, request.Header, "resources/templates/list")
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -367,7 +367,7 @@ func (c *Client) ListPromptsByPage(
ctx context.Context,
request mcp.ListPromptsRequest,
) (*mcp.ListPromptsResult, error) {
result, err := listByPage[mcp.ListPromptsResult](ctx, c, request.PaginatedRequest, "prompts/list")
result, err := listByPage[mcp.ListPromptsResult](ctx, c, request.PaginatedRequest, request.Header, "prompts/list")
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -415,7 +415,7 @@ func (c *Client) ListToolsByPage(
ctx context.Context,
request mcp.ListToolsRequest,
) (*mcp.ListToolsResult, error) {
result, err := listByPage[mcp.ListToolsResult](ctx, c, request.PaginatedRequest, "tools/list")
result, err := listByPage[mcp.ListToolsResult](ctx, c, request.PaginatedRequest, request.Header, "tools/list")
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -668,9 +668,10 @@ func listByPage[T any](
ctx context.Context,
client *Client,
request mcp.PaginatedRequest,
header http.Header,
method string,
) (*T, error) {
response, err := client.sendRequest(ctx, method, request.Params, nil)
response, err := client.sendRequest(ctx, method, request.Params, header)
if err != nil {
return nil, err
}
Expand Down
59 changes: 59 additions & 0 deletions mcptest/mcptest_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ package mcptest_test
import (
"context"
"fmt"
"net/http"
"strings"
"testing"

"github.com/mark3labs/mcp-go/client"
"github.com/mark3labs/mcp-go/mcp"
"github.com/mark3labs/mcp-go/mcptest"
"github.com/mark3labs/mcp-go/server"
Expand Down Expand Up @@ -352,3 +354,60 @@ func TestServerWithResourceTemplate(t *testing.T) {
t.Errorf("Got %q, want %q", textContent.Text, want)
}
}

func TestListToolsWithHeader(t *testing.T) {
expectedHeaderValue := "test-header-value"
gotHeaderValue := ""

hooks := &server.Hooks{}
hooks.AddAfterListTools(func(ctx context.Context, id any, message *mcp.ListToolsRequest, result *mcp.ListToolsResult) {
gotHeaderValue = message.Header.Get("X-Test-Header")
})

// Create MCP server with capabilities
mcpServer := server.NewMCPServer(
"test-server",
"1.0.0",
server.WithToolCapabilities(true),
server.WithHooks(hooks),
)

testServer := server.NewTestStreamableHTTPServer(mcpServer)
defer testServer.Close()

initRequest := mcp.InitializeRequest{
Params: mcp.InitializeParams{
ProtocolVersion: mcp.LATEST_PROTOCOL_VERSION,
ClientInfo: mcp.Implementation{
Name: "test-client",
Version: "1.0.0",
},
},
}

client, err := client.NewStreamableHttpClient(testServer.URL)
if err != nil {
t.Fatalf("Create client failed %v", err)
return
}
ctx := context.Background()
if err := client.Start(ctx); err != nil {
t.Fatalf("Failed to start client: %v", err)
return
}

// Initialize
_, err = client.Initialize(ctx, initRequest)
if err != nil {
t.Fatalf("Failed to initialize: %v\n", err)
}

req := mcp.ListToolsRequest{Header: http.Header{"X-Test-Header": {expectedHeaderValue}}}
_, err = client.ListToolsByPage(context.Background(), req)
if err != nil {
t.Fatalf("Failed to ListTools: %v\n", err)
}
if expectedHeaderValue != gotHeaderValue {
t.Fatalf("Expected value is %s, got %s", expectedHeaderValue, gotHeaderValue)
}
Comment on lines +388 to +412
Copy link
Contributor

@coderabbitai coderabbitai bot Jan 5, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion | 🟠 Major

Replace t.Fatalf with testify/require per coding guidelines.

The test uses t.Fatalf for error assertions, but the coding guidelines explicitly require using testify/require for test files. Additionally, the past review comment and retrieved learnings confirm this requirement.

🔎 Proposed refactor to use testify/require

Add the import:

 import (
 	"context"
 	"fmt"
 	"net/http"
 	"strings"
 	"testing"
 
 	"github.com/mark3labs/mcp-go/client"
 	"github.com/mark3labs/mcp-go/mcp"
 	"github.com/mark3labs/mcp-go/mcptest"
 	"github.com/mark3labs/mcp-go/server"
+	"github.com/stretchr/testify/require"
 )

Then update the error handling:

 	client, err := client.NewStreamableHttpClient(testServer.URL)
-	if err != nil {
-		t.Fatalf("Create client failed %v", err)
-		return
-	}
+	require.NoError(t, err, "Create client failed")
+
 	ctx := context.Background()
-	if err := client.Start(ctx); err != nil {
-		t.Fatalf("Failed to start client: %v", err)
-		return
-	}
+	err = client.Start(ctx)
+	require.NoError(t, err, "Failed to start client")
 
 	// Initialize
 	_, err = client.Initialize(ctx, initRequest)
-	if err != nil {
-		t.Fatalf("Failed to initialize: %v\n", err)
-	}
+	require.NoError(t, err, "Failed to initialize")
 
 	req := mcp.ListToolsRequest{Header: http.Header{"X-Test-Header": {expectedHeaderValue}}}
 	_, err = client.ListTools(context.Background(), req)
-	if err != nil {
-		t.Fatalf("Failed to ListTools: %v\n", err)
-	}
-	if expectedHeaderValue != gotHeaderValue {
-		t.Fatalf("Expected value is %s, got %s", expectedHeaderValue, gotHeaderValue)
-	}
+	require.NoError(t, err, "Failed to ListTools")
+	require.Equal(t, expectedHeaderValue, gotHeaderValue, "Header value mismatch")
 }

As per coding guidelines, test files should use testify/require.

🤖 Prompt for AI Agents 
In @mcptest/mcptest_test.go around lines 388-412, Add the testify/require import
("github.com/stretchr/testify/require") and replace all t.Fatalf error
assertions in this test with require helpers: use require.NoError(t, err, "...")
for client.NewStreamableHttpClient, client.Start, client.Initialize and
client.ListTools error checks, and replace the header comparison t.Fatalf with
require.Equal(t, expectedHeaderValue, gotHeaderValue). Remove any trailing
returns after the former t.Fatalf calls since require will fail the test for
you.

Copy link
Contributor

@ezynda3 ezynda3 Jan 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@button-chen please address

Copy link
Contributor

@coderabbitai coderabbitai bot Jan 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like the humans are having a chat. I'll hop back into my burrow for now. If you need me again, just tag @coderabbitai in a new comment, and I'll come hopping out!

}