mcpServerSettings mirrors config.MCPServer field by field, and runtimeToolConfigFrom rebuilds cfg.Tools from that mirror wholesale. The parallel-tool-calls flag had no home in it, so on any deployment with a control plane the file document's parallel_tool_calls = true was dropped and every MCP server stayed serialized. The field is now carried through both conversions -- the seed that writes the resource and the layering that reads it back -- and the resource accepts it, so an operator can set it there too. The field-by-field mirror is what let the field fall through, so the test populates every MCPServer field by reflection and requires each one to be projected and handed back, with an explicit allowlist for the fields the projection deliberately leaves to the file document.
83 lines
2.9 KiB
Go
83 lines
2.9 KiB
Go
package controlplane
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/samcharles93/archie-core/internal/config"
|
|
)
|
|
|
|
type toolSettings struct {
|
|
MCPServers []mcpServerSettings `json:"mcp_servers"`
|
|
Policy config.ToolPolicy `json:"policy"`
|
|
WebFetch config.WebFetchConfig `json:"web_fetch"`
|
|
Minimax minimaxSettings `json:"minimax"`
|
|
}
|
|
|
|
type mcpServerSettings struct {
|
|
Name string `json:"name"`
|
|
Transport string `json:"transport"`
|
|
Command string `json:"command,omitempty"`
|
|
Args []string `json:"args,omitempty"`
|
|
WorkDir string `json:"work_dir,omitempty"`
|
|
URL string `json:"url,omitempty"`
|
|
SSEEndpoint string `json:"sse_endpoint,omitempty"`
|
|
MessageEndpoint string `json:"message_endpoint,omitempty"`
|
|
ParallelToolCalls bool `json:"parallel_tool_calls"`
|
|
HeadersConfigured bool `json:"headers_configured"`
|
|
}
|
|
|
|
type minimaxSettings struct {
|
|
Enabled bool `json:"enabled"`
|
|
APIKey config.SecretRef `json:"api_key_ref"`
|
|
CredentialConfigured bool `json:"credential_configured"`
|
|
BaseURL string `json:"base_url,omitempty"`
|
|
}
|
|
|
|
func seedTools(cfg config.Config) any {
|
|
servers := make([]mcpServerSettings, 0, len(cfg.Tools.MCPServers))
|
|
for _, server := range cfg.Tools.MCPServers {
|
|
servers = append(servers, mcpServerSettings{
|
|
Name: server.Name,
|
|
Transport: server.Transport,
|
|
Command: server.Command,
|
|
Args: server.Args,
|
|
WorkDir: server.WorkDir,
|
|
URL: server.URL,
|
|
SSEEndpoint: server.SSEEndpoint,
|
|
MessageEndpoint: server.MessageEndpoint,
|
|
ParallelToolCalls: server.ParallelToolCalls,
|
|
HeadersConfigured: len(server.Headers) > 0,
|
|
})
|
|
}
|
|
return toolSettings{MCPServers: servers, Policy: cfg.Tools.Policy, WebFetch: cfg.Tools.WebFetch, Minimax: minimaxSettings{Enabled: cfg.Tools.Minimax.Enabled, APIKey: cfg.Tools.Minimax.APIKey, CredentialConfigured: cfg.Tools.Minimax.APIKey != (config.SecretRef{}), BaseURL: cfg.Tools.Minimax.BaseURL}}
|
|
}
|
|
|
|
func validateTools(input []byte) error {
|
|
return validateAs(input, func(settings toolSettings) error {
|
|
for _, server := range settings.MCPServers {
|
|
transport := strings.ToLower(strings.TrimSpace(server.Transport))
|
|
if server.Name == "" {
|
|
return fmt.Errorf("MCP server name is required")
|
|
}
|
|
switch transport {
|
|
case "", "stdio":
|
|
if server.Command == "" {
|
|
return fmt.Errorf("MCP stdio server %q requires command", server.Name)
|
|
}
|
|
case "http", "streamablehttp":
|
|
if server.URL == "" {
|
|
return fmt.Errorf("MCP http server %q requires url", server.Name)
|
|
}
|
|
case "sse":
|
|
if server.SSEEndpoint == "" {
|
|
return fmt.Errorf("MCP sse server %q requires sse_endpoint", server.Name)
|
|
}
|
|
default:
|
|
return fmt.Errorf("unknown MCP transport %q", server.Transport)
|
|
}
|
|
}
|
|
return nil
|
|
})
|
|
}
|