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

Author: burmudar

internal/mcp/mcp_parse.go

@@ -13,12 +13,17 @@ import (
 var mcpToolListJSON []byte
 
 type ToolDef struct {
-	Name         string `json:"name"`
+	RawName      string `json:"name"`
 	Description  string `json:"description"`
 	InputSchema  Schema `json:"inputSchema"`
 	OutputSchema Schema `json:"outputSchema"`
 }
 
+func (m *ToolDef) Name() string {
+	name, _ := strings.CutPrefix(m.RawName, "sg_")
+	return strings.ReplaceAll(name, "_", "-")
+}
+
 type RawSchema struct {
 	Type                 string                     `json:"type"`
 	Description          string                     `json:"description"`
@@ -98,6 +103,10 @@ func loadToolDefinitions(data []byte) (map[string]*ToolDef, error) {
 		}
 	}
 
+	// 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 {
 		return tools, errors.Append(nil, parser.errors...)
 	}
@@ -169,9 +178,3 @@ 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, "_", "-")
-}

internal/mcp/mcp_parse_test.go

@@ -46,14 +46,13 @@ func TestLoadToolDefinitions(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