reduce duplicate read write tool loops

hungran · hungran · commit dc521444dfcd · 2025-07-11T13:10:21.000+07:00
Signed-off-by: hungran &lt;26101787+hungran@users.noreply.github.com&gt;
diff --git a/pkg/toolsets/toolsets.go b/pkg/toolsets/toolsets.go
@@ -107,22 +107,21 @@ func (t *Toolset) RegisterTools(s *server.MCPServer, prefix string) {
 	if !t.Enabled {
 		return
 	}
-	for _, tool := range t.readTools {
+	registerToolWithPrefix := func(tool server.ServerTool) {
 		toolToRegister := tool.Tool
 		if prefix != "" {
 			// Create a new tool with the prefixed name
 			toolToRegister = createToolWithPrefixedName(tool.Tool, prefix)
 		}
 		s.AddTool(toolToRegister, tool.Handler)
 	}
+
+	for _, tool := range t.readTools {
+		registerToolWithPrefix(tool)
+	}
 	if !t.readOnly {
 		for _, tool := range t.writeTools {
-			toolToRegister := tool.Tool
-			if prefix != "" {
-				// Create a new tool with the prefixed name
-				toolToRegister = createToolWithPrefixedName(tool.Tool, prefix)
-			}
-			s.AddTool(toolToRegister, tool.Handler)
+			registerToolWithPrefix(tool)
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -107,22 +107,21 @@ func (t Toolset) RegisterTools(s server.MCPServer, prefix string) {`
`107`	`107`	`if !t.Enabled {`
`108`	`108`	`return`
`109`	`109`	`}`
`110`		`- for _, tool := range t.readTools {`
	`110`	`+ registerToolWithPrefix := func(tool server.ServerTool) {`
`111`	`111`	`toolToRegister := tool.Tool`
`112`	`112`	`if prefix != "" {`
`113`	`113`	`// Create a new tool with the prefixed name`
`114`	`114`	`toolToRegister = createToolWithPrefixedName(tool.Tool, prefix)`
`115`	`115`	`}`
`116`	`116`	`s.AddTool(toolToRegister, tool.Handler)`
`117`	`117`	`}`
	`118`	`+`
	`119`	`+ for _, tool := range t.readTools {`
	`120`	`+ registerToolWithPrefix(tool)`
	`121`	`+ }`
`118`	`122`	`if !t.readOnly {`
`119`	`123`	`for _, tool := range t.writeTools {`
`120`		`- toolToRegister := tool.Tool`
`121`		`- if prefix != "" {`
`122`		`- // Create a new tool with the prefixed name`
`123`		`- toolToRegister = createToolWithPrefixedName(tool.Tool, prefix)`
`124`		`- }`
`125`		`- s.AddTool(toolToRegister, tool.Handler)`
	`124`	`+ registerToolWithPrefix(tool)`
`126`	`125`	`}`
`127`	`126`	`}`
`128`	`127`	`}`