Skip to content
Closed
Show file tree
Hide file tree
Changes from 3 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
191 changes: 191 additions & 0 deletions router-tests/mcp_hot_reload_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,191 @@
package integration

import (
"encoding/json"
"os"
"path"
"testing"
"time"

"github.com/mark3labs/mcp-go/mcp"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/wundergraph/cosmo/router-tests/testenv"
"github.com/wundergraph/cosmo/router/pkg/config"
)

func TestMCPOperationHotReload(t *testing.T) {
// create a temp graphql file into mcp_operations
mcpOperationsDirectory := "./testdata/mcp_operations"
fileName := "getEmployeeNotes.graphql"
filePath := path.Join(mcpOperationsDirectory, fileName)

t.Parallel()

t.Run("List Updated User Operations On Addition and Removal", func(t *testing.T) {
testenv.Run(t, &testenv.Config{
MCP: config.MCPConfiguration{
Enabled: true,
HotReloadConfig: config.MCPOperationsHotReloadConfig{
Enabled: true,
Interval: 5 * time.Second,
},
},
}, func(t *testing.T, xEnv *testenv.Environment) {

os.Remove(filePath)
Comment thread
endigma marked this conversation as resolved.
Outdated

toolsRequest := mcp.ListToolsRequest{}
resp, err := xEnv.MCPClient.ListTools(xEnv.Context, toolsRequest)
require.NoError(t, err)
require.NotNil(t, resp)

// initial tools count
initialToolsCount := len(resp.Tools)

// create new mcp operation file
file, err := os.Create(filePath)
assert.NoError(t, err)
defer func() {
file.Close()
os.Remove(filePath)
}()
Comment thread
endigma marked this conversation as resolved.
Outdated

// write mcp operation content
_, err = file.WriteString(`
query getEmployeeNotes($id: Int!) {
employee(id: $id) {
id
notes
}
}
`)
assert.NoError(t, err)

require.EventuallyWithT(t, func(t *assert.CollectT) {
// List updated Tools
toolsRequest := mcp.ListToolsRequest{}
resp, err := xEnv.MCPClient.ListTools(xEnv.Context, toolsRequest)
assert.NoError(t, err)

// verify updated tools count
assert.Len(t, resp.Tools, initialToolsCount+1)

// verity getEmployeeNotes operation
require.Contains(t, resp.Tools, mcp.Tool{
Name: "execute_operation_get_employee_notes",
Description: "Executes the GraphQL operation 'getEmployeeNotes' of type query.",
InputSchema: mcp.ToolInputSchema{
Type: "object",
Properties: map[string]interface{}{"id": map[string]interface{}{"type": "integer"}},
Required: []string{"id"},
},
RawInputSchema: json.RawMessage(nil),
Annotations: mcp.ToolAnnotation{
Title: "Execute operation getEmployeeNotes",
ReadOnlyHint: mcp.ToBoolPtr(true),
IdempotentHint: mcp.ToBoolPtr(true),
OpenWorldHint: mcp.ToBoolPtr(true),
},
})
}, 15*time.Second, 250*time.Millisecond)

})
})

t.Run("List Updated User Operations On Content Update", func(t *testing.T) {
testenv.Run(t, &testenv.Config{
MCP: config.MCPConfiguration{
Enabled: true,
HotReloadConfig: config.MCPOperationsHotReloadConfig{
Enabled: true,
Interval: 5 * time.Second,
},
},
}, func(t *testing.T, xEnv *testenv.Environment) {

os.Remove(filePath)

// create new mcp operation file
file, err := os.Create(filePath)
assert.NoError(t, err)
defer func() {
file.Close()
os.Remove(filePath)
}()

// write mcp operation content
_, err = file.WriteString(`
query getEmployeeNotes($id: Int!) {
employee(id: $id) {
id
notes
}
}
`)
assert.NoError(t, err)

require.EventuallyWithT(t, func(t *assert.CollectT) {
// List updated Tools
toolsRequest := mcp.ListToolsRequest{}
resp, err := xEnv.MCPClient.ListTools(xEnv.Context, toolsRequest)
assert.NoError(t, err)

// verity getEmployeeNotes operation
require.Contains(t, resp.Tools, mcp.Tool{
Name: "execute_operation_get_employee_notes",
Description: "Executes the GraphQL operation 'getEmployeeNotes' of type query.",
InputSchema: mcp.ToolInputSchema{
Type: "object",
Properties: map[string]interface{}{"id": map[string]interface{}{"type": "integer"}},
Required: []string{"id"},
},
RawInputSchema: json.RawMessage(nil),
Annotations: mcp.ToolAnnotation{
Title: "Execute operation getEmployeeNotes",
ReadOnlyHint: mcp.ToBoolPtr(true),
IdempotentHint: mcp.ToBoolPtr(true),
OpenWorldHint: mcp.ToBoolPtr(true),
},
})
}, 15*time.Second, 250*time.Millisecond)

// update mcp operation content
err = os.WriteFile(filePath, []byte(`
query getEmployeeNotesUpdatedTitle($id: Int!) {
employee(id: $id) {
id
notes
}
}
`), 0644)
assert.NoError(t, err)

require.EventuallyWithT(t, func(t *assert.CollectT) {
// fetch updated mcp tools list
toolsRequest := mcp.ListToolsRequest{}
resp, err := xEnv.MCPClient.ListTools(xEnv.Context, toolsRequest)
assert.NoError(t, err)

// verity getEmployeeNotesUpdatedTitle operation
require.Contains(t, resp.Tools, mcp.Tool{
Name: "execute_operation_get_employee_notes_updated_title",
Description: "Executes the GraphQL operation 'getEmployeeNotesUpdatedTitle' of type query.",
InputSchema: mcp.ToolInputSchema{
Type: "object",
Properties: map[string]interface{}{"id": map[string]interface{}{"type": "integer"}},
Required: []string{"id"},
},
RawInputSchema: json.RawMessage(nil),
Annotations: mcp.ToolAnnotation{
Title: "Execute operation getEmployeeNotesUpdatedTitle",
ReadOnlyHint: mcp.ToBoolPtr(true),
IdempotentHint: mcp.ToBoolPtr(true),
OpenWorldHint: mcp.ToBoolPtr(true),
},
})
}, 15*time.Second, 250*time.Millisecond)
})
})

}
10 changes: 10 additions & 0 deletions router/core/graph_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -1082,6 +1082,16 @@ func (s *graphServer) buildGraphMux(ctx context.Context,
if mErr := s.mcpServer.Reload(executor.ClientSchema); mErr != nil {
return nil, fmt.Errorf("failed to reload MCP server: %w", mErr)
}
go func() {
for {
if reloadOperations := <-s.mcpServer.ReloadOperationsChannel(); reloadOperations {
s.logger.Log(zap.InfoLevel, "Reloading mcp server!")
if mErr := s.mcpServer.Reload(executor.ClientSchema); mErr != nil {
return
}
Comment on lines +1221 to +1223

@coderabbitai coderabbitai Bot Jul 4, 2025 •

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue

Handle reload errors without terminating the goroutine

If Reload returns an error, the goroutine exits and no further hot reloads will be processed. This could leave the system unable to recover from transient reload failures.

Consider logging the error and continuing to listen for reload signals:

 case <-s.mcpServer.ReloadOperationsChannel():
     s.logger.Log(zap.InfoLevel, "Reloading mcp server!")
     if mErr := s.mcpServer.Reload(ctx, executor.ClientSchema); mErr != nil {
-        return
+        s.logger.Error("Failed to reload MCP server", zap.Error(mErr))
     }
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
if mErr := s.mcpServer.Reload(ctx, executor.ClientSchema); mErr != nil {
return
}
case <-s.mcpServer.ReloadOperationsChannel():
s.logger.Log(zap.InfoLevel, "Reloading mcp server!")
if mErr := s.mcpServer.Reload(ctx, executor.ClientSchema); mErr != nil {
s.logger.Error("Failed to reload MCP server", zap.Error(mErr))
}
🤖 Prompt for AI Agents
In router/core/graph_server.go around lines 1088 to 1090, the current code
returns immediately if s.mcpServer.Reload returns an error, causing the
goroutine to exit and stop processing further reloads. Modify the code to log
the error instead of returning, allowing the goroutine to continue running and
handle subsequent reload signals without termination.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Hi @endigma, Please let me know if it is the expected behaviour to further retry mcpServer reload operations even after reload failure.

Copy link
Copy Markdown
Contributor

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!

}
}
}()
Comment thread
endigma marked this conversation as resolved.
}

if s.Config.cacheWarmup != nil && s.Config.cacheWarmup.Enabled {
Expand Down
2 changes: 2 additions & 0 deletions router/core/router.go
Original file line number Diff line number Diff line change
Expand Up @@ -848,6 +848,8 @@ func (r *Router) bootstrap(ctx context.Context) error {
mcpserver.WithExcludeMutations(r.mcp.ExcludeMutations),
mcpserver.WithEnableArbitraryOperations(r.mcp.EnableArbitraryOperations),
mcpserver.WithExposeSchema(r.mcp.ExposeSchema),
mcpserver.WithHotReload(r.mcp.HotReloadConfig.Enabled),
mcpserver.WithHotReloadInterval(r.mcp.HotReloadConfig.Interval),
Comment thread
endigma marked this conversation as resolved.
Outdated
}

// Determine the router GraphQL endpoint
Expand Down
22 changes: 14 additions & 8 deletions router/pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -898,14 +898,15 @@ type CacheWarmupConfiguration struct {
}

type MCPConfiguration struct {
Enabled bool `yaml:"enabled" envDefault:"false" env:"MCP_ENABLED"`
Server MCPServer `yaml:"server,omitempty"`
Storage MCPStorageConfig `yaml:"storage,omitempty"`
GraphName string `yaml:"graph_name" envDefault:"mygraph" env:"MCP_GRAPH_NAME"`
ExcludeMutations bool `yaml:"exclude_mutations" envDefault:"false" env:"MCP_EXCLUDE_MUTATIONS"`
EnableArbitraryOperations bool `yaml:"enable_arbitrary_operations" envDefault:"false" env:"MCP_ENABLE_ARBITRARY_OPERATIONS"`
ExposeSchema bool `yaml:"expose_schema" envDefault:"false" env:"MCP_EXPOSE_SCHEMA"`
RouterURL string `yaml:"router_url,omitempty" env:"MCP_ROUTER_URL"`
Enabled bool `yaml:"enabled" envDefault:"false" env:"MCP_ENABLED"`
Server MCPServer `yaml:"server,omitempty"`
Storage MCPStorageConfig `yaml:"storage,omitempty"`
GraphName string `yaml:"graph_name" envDefault:"mygraph" env:"MCP_GRAPH_NAME"`
ExcludeMutations bool `yaml:"exclude_mutations" envDefault:"false" env:"MCP_EXCLUDE_MUTATIONS"`
EnableArbitraryOperations bool `yaml:"enable_arbitrary_operations" envDefault:"false" env:"MCP_ENABLE_ARBITRARY_OPERATIONS"`
ExposeSchema bool `yaml:"expose_schema" envDefault:"false" env:"MCP_EXPOSE_SCHEMA"`
RouterURL string `yaml:"router_url,omitempty" env:"MCP_ROUTER_URL"`
HotReloadConfig MCPOperationsHotReloadConfig `yaml:"hot_reload_config,omitempty" envPrefix:"MCP_OPERATIONS_HOT_RELOAD_"`
}

type MCPStorageConfig struct {
Expand All @@ -917,6 +918,11 @@ type MCPServer struct {
BaseURL string `yaml:"base_url,omitempty" env:"MCP_SERVER_BASE_URL"`
}

type MCPOperationsHotReloadConfig struct {
Enabled bool `yaml:"enabled" envDefault:"false" env:"ENABLED"`
Interval time.Duration `yaml:"interval" envDefault:"10s" env:"INTERVAL"`
}

type PluginsConfiguration struct {
Enabled bool `yaml:"enabled" envDefault:"false" env:"ENABLED"`
Path string `yaml:"path" envDefault:"plugins" env:"PATH"`
Expand Down
21 changes: 21 additions & 0 deletions router/pkg/config/config.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -1903,6 +1903,27 @@
"type": "boolean",
"default": false,
"description": "Expose the full GraphQL schema through MCP. When enabled, AI models can request the complete schema of your API."
},
"hot_reload_config": {
"type": "object",
"default": false,
"description": "Hot reloading configuration for MCP operations.",
"additionalProperties": false,
Comment thread
coderabbitai[bot] marked this conversation as resolved.
"properties": {
"enabled": {
"type": "boolean",
"description": "Enable hot reloading for MCP Operations.",
"default": false
},
"interval": {
"type": "string",
"description": "The interval at which the MCP Operations directory is checked for changes. The period is specified as a string with a number and a unit, e.g. 10ms, 1s, 1m, 1h. The supported units are 'ms', 's', 'm', 'h'.",
"default": "10s",
"duration": {
"minimum": "5s"
}
}
}
}
}
},
Expand Down
3 changes: 3 additions & 0 deletions router/pkg/config/fixtures/full.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ mcp:
base_url: "http://localhost:5025"
storage:
provider_id: mcp
hot_reload_config:
enabled: false
interval: '10s'

watch_config:
enabled: true
Expand Down
6 changes: 5 additions & 1 deletion router/pkg/config/testdata/config_defaults.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,11 @@
"ExcludeMutations": false,
"EnableArbitraryOperations": false,
"ExposeSchema": false,
"RouterURL": ""
"RouterURL": "",
"HotReloadConfig": {
"Enabled": false,
"Interval": 10000000000
}
},
"DemoMode": false,
"Modules": null,
Expand Down
6 changes: 5 additions & 1 deletion router/pkg/config/testdata/config_full.json
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,11 @@
"ExcludeMutations": false,
"EnableArbitraryOperations": false,
"ExposeSchema": false,
"RouterURL": "https://cosmo-router.wundergraph.com"
"RouterURL": "https://cosmo-router.wundergraph.com",
"HotReloadConfig": {
"Enabled": false,
"Interval": 10000000000
}
},
"DemoMode": true,
"Modules": {
Expand Down
5 changes: 3 additions & 2 deletions router/pkg/mcpserver/operation_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package mcpserver

import (
"fmt"
"time"

"github.com/wundergraph/cosmo/router/pkg/schemaloader"
"github.com/wundergraph/graphql-go-tools/v2/pkg/ast"
Expand Down Expand Up @@ -30,10 +31,10 @@ func NewOperationsManager(schemaDoc *ast.Document, logger *zap.Logger, excludeMu
}

// LoadOperationsFromDirectory loads operations from a specified directory
func (om *OperationsManager) LoadOperationsFromDirectory(operationsDir string) error {
func (om *OperationsManager) LoadOperationsFromDirectory(operationsDir string, reloadOperationsChan chan bool, hotReload bool, hotReloadInterval time.Duration) error {
// Load operations
loader := schemaloader.NewOperationLoader(om.logger, om.schemaDoc)
operations, err := loader.LoadOperationsFromDirectory(operationsDir)
operations, err := loader.LoadOperationsFromDirectory(operationsDir, reloadOperationsChan, hotReload, hotReloadInterval)
if err != nil {
return fmt.Errorf("failed to load operations: %w", err)
}
Expand Down
Loading