tighten up

Change-Id: Ie2bd50af8f24f3bf1b74168b1f5db5a4b593c8ad

Author: paulirish

docs/tool-reference.md

@@ -235,13 +235,13 @@
 
 ### `performance_query_chrome_ux_report`
 
-**Description:** Queries the Chrome UX Report (CrUX) API to get real-user experience metrics (like Core Web Vitals) for a given URL or origin. You must provide EITHER "origin" OR "url", but not both. You can optionally filter by "formFactor".
+**Description:** Queries the Chrome UX Report (aka CrUX) to get aggregated real-user experience metrics (like Core Web Vitals) for a given URL or origin.
 
 **Parameters:**
 
+- **origin** (string) _(optional)_: The origin to query, e.g., "https://web.dev". Do not provide this if "url" is specified.
+- **url** (string) _(optional)_: The specific page URL to query, e.g., "https://web.dev/s/results?q=puppies". Do not provide this if "origin" is specified.
 - **formFactor** (enum: "DESKTOP", "PHONE", "TABLET") _(optional)_: The form factor to filter by. If omitted, data for all form factors is aggregated.
-- **origin** (string) _(optional)_: The origin to query, e.g., "https://www.google.com". Do not provide this if "url" is specified.
-- **url** (string) _(optional)_: The specific page URL to query, e.g., "https://www.google.com/search?q=puppies". Do not provide this if "origin" is specified.
 
 ---
 

src/tools/performance.ts

@@ -193,7 +193,7 @@ const CRUX_ENDPOINT = `https://chromeuxreport.googleapis.com/v1/records:queryRec
 export const queryChromeUXReport = defineTool({
   name: 'performance_query_chrome_ux_report',
   description:
-    'Queries the Chrome UX Report (aka CrUX) to get aggregated real-user experience metrics (like Core Web Vitals) for a given URL or origin. You must provide EITHER "origin" OR "url", but not both. You can optionally filter by "formFactor".',
+    'Queries the Chrome UX Report (aka CrUX) to get aggregated real-user experience metrics (like Core Web Vitals) for a given URL or origin.',
   annotations: {
     category: ToolCategory.PERFORMANCE,
     readOnlyHint: true,
@@ -202,13 +202,13 @@ export const queryChromeUXReport = defineTool({
     origin: zod
       .string()
       .describe(
-        'The origin to query, e.g., "https://www.google.com". Do not provide this if "url" is specified.',
+        'The origin to query, e.g., "https://web.dev". Do not provide this if "url" is specified.',
       )
       .optional(),
     url: zod
       .string()
       .describe(
-        'The specific page URL to query, e.g., "https://www.google.com/search?q=puppies". Do not provide this if "origin" is specified.',
+        'The specific page URL to query, e.g., "https://web.dev/s/results?q=puppies". Do not provide this if "origin" is specified.',
       )
       .optional(),
     formFactor: zod
@@ -219,13 +219,14 @@ export const queryChromeUXReport = defineTool({
       .optional(),
   },
   handler: async (request, response) => {
-    const {origin, url, formFactor} = request.params;
+    const {origin: origin_, url, formFactor} = request.params;
+    // Ensure probably formatted origin (no trailing slash);
+    const origin = URL.parse(origin_ ?? '')?.origin;
 
     if ((!origin && !url) || (origin && url)) {
-      response.appendResponseLine(
+      return response.appendResponseLine(
         'Error: you must provide either "origin" or "url", but not both.',
       );
-      return;
     }
 
     try {