change name to RawName and have method for Name() that is normalized

Author: burmudar

cmd/src/mcp_parse.go

@@ -13,17 +13,15 @@ import (
 var mcpToolListJSON []byte
 
 type MCPToolDef struct {
-	Name         string `json:"name"`
+	RawName      string `json:"name"`
 	Description  string `json:"description"`
 	InputSchema  Schema `json:"inputSchema"`
 	OutputSchema Schema `json:"outputSchema"`
 }
 
-type InputProperty struct {
-	Name        string
-	Type        string
-	Description string
-	ItemType    string
+func (m *MCPToolDef) Name() string {
+	name, _ := strings.CutPrefix(m.RawName, "sg_")
+	return strings.ReplaceAll(name, "_", "-")
 }
 
 type Schema struct {
@@ -143,12 +141,6 @@ func (p *Parser) parseProperties(props map[string]json.RawMessage) map[string]Sc
 	return res
 }
 
-// normalizeToolName takes mcp tool names like 'sg_keyword_search' and normalizes it to 'keyword-search"
-func normalizeToolName(toolName string) string {
-	toolName, _ = strings.CutPrefix(toolName, "sg_")
-	return strings.ReplaceAll(toolName, "_", "-")
-}
-
 func LoadMCPToolDefinitions(data []byte) (map[string]*MCPToolDef, error) {
 	defs := struct {
 		Tools []struct {
@@ -167,13 +159,16 @@ func LoadMCPToolDefinitions(data []byte) (map[string]*MCPToolDef, error) {
 	parser := &Parser{}
 
 	for _, t := range defs.Tools {
-		name := normalizeToolName(t.Name)
-		tools[name] = &MCPToolDef{
-			Name:         t.Name,
+		def := &MCPToolDef{
+			RawName:      t.Name,
 			Description:  t.Description,
 			InputSchema:  parser.parseRootSchema(t.InputSchema),
 			OutputSchema: parser.parseRootSchema(t.OutputSchema),
 		}
+
+		// make it so that can find a tool definition by it's original name (RawName) and normalized name (Name())
+		tools[def.RawName] = def
+		tools[def.Name()] = def
 	}
 
 	if len(parser.errors) > 0 {

cmd/src/mcp_parse_test.go

@@ -46,14 +46,13 @@ func TestLoadMCPToolDefinitions(t *testing.T) {
 		t.Fatalf("Expected 1 tool, got %d", len(tools))
 	}
 
-	// Temporary: map keys have normalized names
 	tool := tools["test-tool"]
 	if tool == nil {
 		t.Fatal("Tool 'test_tool' not found")
 	}
 
-	if tool.Name != "test_tool" {
-		t.Errorf("Expected name 'test_tool', got '%s'", tool.Name)
+	if tool.RawName != "sg_test_tool" {
+		t.Errorf("Expected name 'sg_test_tool', got '%s'", tool.RawName)
 	}
 
 	inputSchema := tool.InputSchema