fix: correct the ordering of the as tool name aliases for MCP servers (gptscript-ai#970)

thedadams · web-flow · commit b98000c54e2a · 2025-05-13T16:45:28.000-04:00
Signed-off-by: Donnie Adams &lt;donnie@acorn.io&gt;
diff --git a/pkg/mcp/loader.go b/pkg/mcp/loader.go
@@ -234,11 +234,12 @@ func (l *Local) sessionToTools(ctx context.Context, session *Session, toolName s
 		}
 
 		if tool.Annotations.Title != "" && !slices.Contains(strings.Fields(tool.Annotations.Title), "as") {
-			toolDef.Name = tool.Annotations.Title + " as " + tool.Name
+			toolNames = append(toolNames, tool.Name+" as "+tool.Annotations.Title)
+		} else {
+			toolNames = append(toolNames, tool.Name)
 		}
 
 		toolDefs = append(toolDefs, toolDef)
-		toolNames = append(toolNames, tool.Name)
 	}
 
 	main := types.Tool{

Original file line number	Diff line number	Diff line change
`@@ -234,11 +234,12 @@ func (l Local) sessionToTools(ctx context.Context, session Session, toolName s`
`234`	`234`	`}`
`235`	`235`
`236`	`236`	`if tool.Annotations.Title != "" && !slices.Contains(strings.Fields(tool.Annotations.Title), "as") {`
`237`		`- toolDef.Name = tool.Annotations.Title + " as " + tool.Name`
	`237`	`+ toolNames = append(toolNames, tool.Name+" as "+tool.Annotations.Title)`
	`238`	`+ } else {`
	`239`	`+ toolNames = append(toolNames, tool.Name)`
`238`	`240`	`}`
`239`	`241`
`240`	`242`	`toolDefs = append(toolDefs, toolDef)`
`241`		`- toolNames = append(toolNames, tool.Name)`
`242`	`243`	`}`
`243`	`244`
`244`	`245`	`main := types.Tool{`