Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions internal/ghmcp/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,13 @@ func NewMCPServer(cfg MCPServerConfig) (*mcp.Server, error) {
cfg.ContentWindowSize,
)

// Inject dependencies into context for all tool handlers
ghServer.AddReceivingMiddleware(func(next mcp.MethodHandler) mcp.MethodHandler {
return func(ctx context.Context, method string, req mcp.Request) (mcp.Result, error) {
return next(github.ContextWithDeps(ctx, deps), method, req)
}
})

// Build and register the tool/resource/prompt inventory
inventory := github.NewInventory(cfg.Translator).
WithDeprecatedAliases(github.DeprecatedToolAliases).
Expand Down
112 changes: 112 additions & 0 deletions internal/ghmcp/server_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
package ghmcp

import (
"testing"

"github.com/github/github-mcp-server/pkg/translations"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

// TestNewMCPServer_CreatesSuccessfully verifies that the server can be created
// with the deps injection middleware properly configured.
func TestNewMCPServer_CreatesSuccessfully(t *testing.T) {
t.Parallel()

// Create a minimal server configuration
cfg := MCPServerConfig{
Version: "test",
Host: "", // defaults to github.com
Token: "test-token",
EnabledToolsets: []string{"context"},
ReadOnly: false,
Translator: translations.NullTranslationHelper,
ContentWindowSize: 5000,
LockdownMode: false,
}

// Create the server
server, err := NewMCPServer(cfg)
require.NoError(t, err, "expected server creation to succeed")
require.NotNil(t, server, "expected server to be non-nil")

// The fact that the server was created successfully indicates that:
// 1. The deps injection middleware is properly added
// 2. Tools can be registered without panicking
//
// If the middleware wasn't properly added, tool calls would panic with
// "ToolDependencies not found in context" when executed.
//
// The actual middleware functionality and tool execution with ContextWithDeps
// is already tested in pkg/github/*_test.go.
}

// TestResolveEnabledToolsets verifies the toolset resolution logic.
func TestResolveEnabledToolsets(t *testing.T) {
t.Parallel()

tests := []struct {
name string
cfg MCPServerConfig
expectedResult []string
}{
{
name: "nil toolsets without dynamic mode and no tools - use defaults",
cfg: MCPServerConfig{
EnabledToolsets: nil,
DynamicToolsets: false,
EnabledTools: nil,
},
expectedResult: nil, // nil means "use defaults"
},
{
name: "nil toolsets with dynamic mode - start empty",
cfg: MCPServerConfig{
EnabledToolsets: nil,
DynamicToolsets: true,
EnabledTools: nil,
},
expectedResult: []string{}, // empty slice means no toolsets
},
{
name: "explicit toolsets",
cfg: MCPServerConfig{
EnabledToolsets: []string{"repos", "issues"},
DynamicToolsets: false,
},
expectedResult: []string{"repos", "issues"},
},
{
name: "empty toolsets - disable all",
cfg: MCPServerConfig{
EnabledToolsets: []string{},
DynamicToolsets: false,
},
expectedResult: []string{}, // empty slice means no toolsets
},
{
name: "specific tools without toolsets - no default toolsets",
cfg: MCPServerConfig{
EnabledToolsets: nil,
DynamicToolsets: false,
EnabledTools: []string{"get_me"},
},
expectedResult: []string{}, // empty slice when tools specified but no toolsets
},
{
name: "dynamic mode with explicit toolsets removes all and default",
cfg: MCPServerConfig{
EnabledToolsets: []string{"all", "repos"},
DynamicToolsets: true,
},
expectedResult: []string{"repos"}, // "all" is removed in dynamic mode
},
}

for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
result := resolveEnabledToolsets(tc.cfg)
assert.Equal(t, tc.expectedResult, result)
})
}
}
Loading