remove Name() method and use method name field

Author: burmudar

internal/mcp/mcp_parse.go

@@ -13,17 +13,13 @@ import (
 var mcpToolListJSON []byte
 
 type ToolDef struct {
+	Name         string
 	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"`
@@ -94,19 +90,21 @@ func loadToolDefinitions(data []byte) (map[string]*ToolDef, error) {
 	parser := &parser{}
 
 	for _, t := range defs.Tools {
-		name := normalizeToolName(t.Name)
-		tools[name] = &ToolDef{
-			Name:         t.Name,
+		// normalize the raw mcp tool name to be without the mcp identifiers
+		rawName := t.Name
+		name, _ := strings.CutPrefix(rawName, "sg_")
+		name = strings.ReplaceAll(name, "_", "-")
+
+		tool := &ToolDef{
+			Name:         name,
+			RawName:      rawName,
 			Description:  t.Description,
 			InputSchema:  parser.parseRootSchema(t.InputSchema),
 			OutputSchema: parser.parseRootSchema(t.OutputSchema),
 		}
+		tools[tool.Name] = tool
 	}
 
-	// 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...)
 	}