improve logic by returning aliases used in resolvetoolaliases

Author: tommaso-moro

internal/ghmcp/server.go

@@ -178,7 +178,7 @@ func NewMCPServer(cfg MCPServerConfig) (*mcp.Server, error) {
 	if len(cfg.EnabledTools) > 0 {
 		// Clean tool names and resolve deprecated aliases
 		enabledTools := github.CleanTools(cfg.EnabledTools)
-		enabledTools = tsg.ResolveToolAliases(enabledTools)
+		enabledTools, _ = tsg.ResolveToolAliases(enabledTools)
 
 		// Register the specified tools (additive to any toolsets already enabled)
 		err = tsg.RegisterSpecificTools(ghServer, enabledTools, cfg.ReadOnly)

pkg/toolsets/toolsets.go

@@ -324,18 +324,22 @@ func NewToolDoesNotExistError(name string) *ToolDoesNotExistError {
 
 // ResolveToolAliases resolves deprecated tool aliases to their canonical names.
 // It logs a warning to stderr for each deprecated alias that is resolved.
-// Returns the list of tool names with aliases replaced by canonical names.
-func (tg *ToolsetGroup) ResolveToolAliases(toolNames []string) []string {
-	resolved := make([]string, 0, len(toolNames))
+// Returns:
+//   - resolved: tool names with aliases replaced by canonical names
+//   - aliasesUsed: map of oldName → newName for each alias that was resolved
+func (tg *ToolsetGroup) ResolveToolAliases(toolNames []string) (resolved []string, aliasesUsed map[string]string) {
+	resolved = make([]string, 0, len(toolNames))
+	aliasesUsed = make(map[string]string)
 	for _, toolName := range toolNames {
 		if canonicalName, isAlias := tg.deprecatedAliases[toolName]; isAlias {
 			fmt.Fprintf(os.Stderr, "Warning: tool %q is deprecated, use %q instead\n", toolName, canonicalName)
+			aliasesUsed[toolName] = canonicalName
 			resolved = append(resolved, canonicalName)
 		} else {
 			resolved = append(resolved, toolName)
 		}
 	}
-	return resolved
+	return resolved, aliasesUsed
 }
 
 // FindToolByName searches all toolsets (enabled or disabled) for a tool by its canonical name.

pkg/toolsets/toolsets_test.go

@@ -334,8 +334,9 @@ func TestResolveToolAliases(t *testing.T) {
 
 	// Test resolving a mix of aliases and canonical names
 	input := []string{"get_issue", "some_tool", "create_pr"}
-	resolved := tsg.ResolveToolAliases(input)
+	resolved, aliasesUsed := tsg.ResolveToolAliases(input)
 
+	// Verify resolved names
 	if len(resolved) != 3 {
 		t.Fatalf("expected 3 resolved names, got %d", len(resolved))
 	}
@@ -348,6 +349,17 @@ func TestResolveToolAliases(t *testing.T) {
 	if resolved[2] != "pull_request_create" {
 		t.Errorf("expected 'pull_request_create', got '%s'", resolved[2])
 	}
+
+	// Verify aliasesUsed map
+	if len(aliasesUsed) != 2 {
+		t.Fatalf("expected 2 aliases used, got %d", len(aliasesUsed))
+	}
+	if aliasesUsed["get_issue"] != "issue_read" {
+		t.Errorf("expected aliasesUsed['get_issue'] = 'issue_read', got '%s'", aliasesUsed["get_issue"])
+	}
+	if aliasesUsed["create_pr"] != "pull_request_create" {
+		t.Errorf("expected aliasesUsed['create_pr'] = 'pull_request_create', got '%s'", aliasesUsed["create_pr"])
+	}
 }
 
 func TestFindToolByName(t *testing.T) {