Update tool registrations during reload

Author: slimslenderslacks

pkg/gateway/dynamic_mcps.go

@@ -673,14 +673,54 @@ func (g *Gateway) createMcpAddTool(clientConfig *clientConfig) *ToolRegistration
 			log.Log("Warning: Failed to persist configuration:", err)
 		}
 
+		// Get the list of tools that were just added from this server
+		var addedTools []*mcp.Tool
+		g.capabilitiesMu.RLock()
+		if serverCaps := g.serverCapabilities[serverName]; serverCaps != nil {
+			for _, toolName := range serverCaps.ToolNames {
+				if toolReg, exists := g.toolRegistrations[toolName]; exists {
+					addedTools = append(addedTools, toolReg.Tool)
+				}
+			}
+		}
+		g.capabilitiesMu.RUnlock()
+
+		// Build the response text
+		responseText := fmt.Sprintf("Successfully added %d tools in server '%s'. Assume that it is fully configured and ready to use.", len(addedTools), serverName)
+
+		// Include the JSON representation of the newly added tools
+		// This is useful when the client session does not support tool change notifications
+		if len(addedTools) > 0 {
+			// Create a tools list response matching the format from tools/list
+			toolsList := make([]map[string]any, 0, len(addedTools))
+			for _, tool := range addedTools {
+				toolMap := map[string]any{
+					"name":        tool.Name,
+					"description": tool.Description,
+				}
+				if tool.InputSchema != nil {
+					toolMap["inputSchema"] = tool.InputSchema
+				}
+				toolsList = append(toolsList, toolMap)
+			}
+
+			// Convert to JSON
+			toolsJSON, err := json.MarshalIndent(map[string]any{
+				"tools": toolsList,
+			}, "", "  ")
+			if err == nil {
+				responseText += "\n\nNewly added tools:\n```json\n" + string(toolsJSON) + "\n```"
+			}
+		}
+
 		// Register DCR client and start OAuth provider if this is a remote OAuth server
 		if g.McpOAuthDcrEnabled && serverConfig != nil && serverConfig.Spec.IsRemoteOAuthServer() {
 			return g.addRemoteOAuthServer(ctx, serverName, req)
 		}
 
 		return &mcp.CallToolResult{
 			Content: []mcp.Content{&mcp.TextContent{
-				Text: fmt.Sprintf("Successfully added server '%s'. Assume that it is fully configured and ready to use.", serverName),
+				Text: responseText,
 			}},
 		}, nil
 	}

pkg/gateway/reload.go

@@ -268,6 +268,10 @@ func (g *Gateway) reloadServerConfiguration(ctx context.Context, serverName stri
 	// Remove old capabilities that are no longer present
 	if len(removedTools) > 0 {
 		g.mcpServer.RemoveTools(removedTools...)
+		// Remove from tool registrations tracking
+		for _, toolName := range removedTools {
+			delete(g.toolRegistrations, toolName)
+		}
 		log.Log("  - Removed", len(removedTools), "tools for", serverName)
 	}
 
@@ -290,6 +294,8 @@ func (g *Gateway) reloadServerConfiguration(ctx context.Context, serverName stri
 	for _, tool := range addedTools {
 		if registration, err := newServerCaps.getToolByName(tool); err == nil {
 			g.mcpServer.AddTool(registration.Tool, registration.Handler)
+			// Track tool registration for mcp-exec and mcp-add
+			g.toolRegistrations[registration.Tool.Name] = registration
 		}
 	}
 	if len(addedTools) > 0 {