chore: merge

Author: Fluf22

src/server/init-server.ts

@@ -12,9 +12,11 @@ import {
 import { registerOpenApiTools } from "../tools/registerOpenApi.ts";
 import {
   ABTestingSpec,
-  AnalyticsSpec, CollectionsSpec,
+  AnalyticsSpec,
+  CollectionsSpec,
   IngestionSpec,
   MonitoringSpec,
+  QuerySuggestionsSpec,
   RecommendSpec,
   SearchSpec,
   UsageSpec
@@ -105,6 +107,28 @@ export async function initMCPServer(opts: StartServerOptions): Promise<McpServer
       dashboardApi,
       openApiSpec: UsageSpec,
       toolFilter,
+      requestMiddlewares: [
+        // The Usage API expects `name` parameter as multiple values
+        // rather than comma-separated.
+        async ({ request }) => {
+          const url = new URL(request.url);
+          const nameParams = url.searchParams.get("name");
+
+          if (!nameParams) {
+            return new Request(url, request.clone());
+          }
+
+          const nameValues = nameParams.split(",");
+
+          url.searchParams.delete("name");
+
+          nameValues.forEach((value) => {
+            url.searchParams.append("name", value);
+          });
+
+          return new Request(url, request.clone());
+        },
+      ],
     });
 
     // Ingestion API Tools
@@ -141,6 +165,14 @@ export async function initMCPServer(opts: StartServerOptions): Promise<McpServer
       toolFilter,
     });
 
+    // Query Suggestions API Tools
+    registerOpenApiTools({
+      server,
+      dashboardApi,
+      openApiSpec: QuerySuggestionsSpec,
+      toolFilter,
+    });
+
     return server;
   } catch (err) {
     console.error("Error starting server:", err);