Merge branch 'main' into mcp-dialog-pt3

Author: samiyac

src/telemetry/ClearcutLogger.ts

@@ -90,12 +90,25 @@ export function transformArgType(zodType: ZodType): string {
   }
 }
 
+const BUCKETS = [
+  0, 1, 2, 5, 10, 20, 50, 100, 200, 500, 1000, 2000, 5000, 10000,
+];
+
+function bucketize(value: number): number {
+  for (const bucket of BUCKETS) {
+    if (bucket >= value) {
+      return bucket;
+    }
+  }
+  return BUCKETS[BUCKETS.length - 1];
+}
+
 function transformValue(
   zodType: ZodType,
   value: unknown,
 ): LoggedToolCallArgValue {
   if (zodType === 'ZodString') {
-    return (value as string).length;
+    return bucketize((value as string).length);
   } else if (zodType === 'ZodArray') {
     return (value as unknown[]).length;
   } else {

tests/telemetry/ClearcutLogger.test.ts

@@ -235,6 +235,35 @@ describe('ClearcutLogger', () => {
       });
     });
 
+    it('bucketizes string lengths correctly', () => {
+      const schema = {
+        str0: zod.string(),
+        str1: zod.string(),
+        str3: zod.string(),
+        str5: zod.string(),
+        str10000: zod.string(),
+        str10001: zod.string(),
+      };
+
+      const params = {
+        str0: '',
+        str1: 'a',
+        str3: 'abc',
+        str5: 'abcde',
+        str10000: 'a'.repeat(10000),
+        str10001: 'a'.repeat(10001),
+      };
+
+      const sanitized = sanitizeParams(params, schema);
+
+      assert.strictEqual(sanitized.str0_length, 0);
+      assert.strictEqual(sanitized.str1_length, 1);
+      assert.strictEqual(sanitized.str3_length, 5); // snaps to 5
+      assert.strictEqual(sanitized.str5_length, 5);
+      assert.strictEqual(sanitized.str10000_length, 10000);
+      assert.strictEqual(sanitized.str10001_length, 10000); // snaps to 10000
+    });
+
     it('throws error for unsupported types', () => {
       const schema = {
         myObj: zod.object({foo: zod.string()}),

tests/tools/console.test.js.snapshot

@@ -118,6 +118,47 @@ Learn more:
 reqid=<reqid> data={"corsErrorStatus":{"corsError":"PreflightMissingAllowOriginHeader","failedParameter":""},"isWarning":false,"request":{"url":"http://hostname:port/data.json"},"initiatorOrigin":"","clientSecurityState":{"initiatorIsSecureContext":false,"initiatorIPAddressSpace":"Loopback","localNetworkAccessRequestPolicy":"BlockFromInsecureToMorePrivate"}}
 `;
 
+exports[`console > get_console_message > when dialog is open 1`] = `
+{
+  "dialog": {
+    "type": "alert",
+    "message": "test dialog",
+    "defaultValue": ""
+  },
+  "consoleMessage": {
+    "id": 1,
+    "type": "error",
+    "text": "This is an error",
+    "argsCount": 1,
+    "args": [
+      "This is an error"
+    ],
+    "stackTrace": "at  (VM7:1:9)\\nat  (pptr:;CdpFrame.%3Canonymous%3E%20(<file-path>)\\n--- PendingScript ----------------------\\nat  (pptr:;CdpFrame.%3Canonymous%3E%20(<file-path>)\\nNote: line and column numbers use 1-based indexing"
+  },
+  "pagination": {
+    "currentPage": 0,
+    "totalPages": 1,
+    "hasNextPage": false,
+    "hasPreviousPage": false,
+    "startIndex": 0,
+    "endIndex": 1,
+    "invalidPage": false
+  },
+  "consoleMessages": [
+    {
+      "type": "error",
+      "text": "This is an error",
+      "argsCount": 1,
+      "id": 1
+    }
+  ]
+}
+`;
+
+exports[`console > list_console_messages > issues > when dialog is open 1`] = `
+{"content":[{"type":"text","text":"# Open dialog\\nalert: test dialog.\\nCall handle_dialog to handle it before continuing.\\n## Console messages\\nShowing 1-1 of 1 (Page 1 of 1).\\nmsgid=1 [log] Pre-dialog message (1 args)"}],"structuredContent":{"dialog":{"type":"alert","message":"test dialog","defaultValue":""},"pagination":{"currentPage":0,"totalPages":1,"hasNextPage":false,"hasPreviousPage":false,"startIndex":0,"endIndex":1,"invalidPage":false},"consoleMessages":[{"type":"log","text":"Pre-dialog message","argsCount":1,"id":1}]}}
+`;
+
 exports[`console > list_console_messages > lists error objects 1`] = `
 ## Console messages
 Showing 1-1 of 1 (Page 1 of 1).

tests/tools/console.test.ts

@@ -7,6 +7,8 @@
 import assert from 'node:assert';
 import {before, describe, it} from 'node:test';
 
+import type {Dialog} from 'puppeteer-core';
+
 import type {ParsedArguments} from '../../src/bin/chrome-devtools-mcp-cli-options.js';
 import {loadIssueDescriptions} from '../../src/issue-descriptions.js';
 import {McpResponse} from '../../src/McpResponse.js';
@@ -17,7 +19,11 @@ import {
   listConsoleMessages,
 } from '../../src/tools/console.js';
 import {serverHooks} from '../server.js';
-import {getTextContent, withMcpContext} from '../utils.js';
+import {
+  getTextContent,
+  withMcpContext,
+  stabilizeStructuredContent,
+} from '../utils.js';
 
 describe('console', () => {
   before(async () => {
@@ -162,6 +168,37 @@ describe('console', () => {
           }
         });
       });
+
+      it('when dialog is open', async t => {
+        await withMcpContext(async (response, context) => {
+          const page = context.getSelectedPptrPage();
+          await page.setContent(
+            '<script>console.log("Pre-dialog message")</script>',
+          );
+
+          const dialogPromise = new Promise<Dialog>(resolve => {
+            page.on('dialog', dialog => resolve(dialog));
+          });
+
+          page.evaluate(() => {
+            alert('test dialog');
+          });
+          const dialog = await dialogPromise;
+
+          await listConsoleMessages().handler(
+            {params: {}, page: context.getSelectedMcpPage()},
+            response,
+            context,
+          );
+
+          const result = await response.handle(
+            'list_console_messages',
+            context,
+          );
+          t.assert.snapshot?.(JSON.stringify(result));
+          await dialog.dismiss();
+        });
+      });
     });
   });
 
@@ -474,5 +511,44 @@ describe('console', () => {
         t.assert.snapshot?.(rawText);
       });
     });
+
+    it('when dialog is open', async t => {
+      await withMcpContext(async (response, context) => {
+        const page = context.getSelectedPptrPage();
+        await page.setContent(
+          '<script>console.error("This is an error")</script>',
+        );
+
+        await listConsoleMessages().handler(
+          {params: {}, page: context.getSelectedMcpPage()},
+          response,
+          context,
+        );
+
+        const dialogPromise = new Promise<Dialog>(resolve => {
+          page.on('dialog', dialog => resolve(dialog));
+        });
+        page.evaluate(() => {
+          alert('test dialog');
+        });
+        const dialog = await dialogPromise;
+
+        await getConsoleMessage.handler(
+          {params: {msgid: 1}, page: context.getSelectedMcpPage()},
+          response,
+          context,
+        );
+
+        const result = await response.handle('get_console_message', context);
+        t.assert.snapshot?.(
+          JSON.stringify(
+            stabilizeStructuredContent(result.structuredContent),
+            null,
+            2,
+          ),
+        );
+        await dialog.dismiss();
+      });
+    });
   });
 });

tests/tools/pages.test.js.snapshot

@@ -1,3 +1,7 @@
+exports[`pages > close_page > when dialog is open 1`] = `
+{"content":[{"type":"text","text":"## Pages\\n1: about:blank [selected]"}],"structuredContent":{"pages":[{"id":1,"url":"about:blank","selected":true}]}}
+`;
+
 exports[`pages > list_pages > list pages for extension pages with --category-extensions 1`] = `
 ## Pages
 1: about:blank [selected]
@@ -25,3 +29,23 @@ exports[`pages > list_pages > list pages for side panels with --category-extensi
 ## Extension Service Workers
 sw-1: chrome-extension://<extension-id>/sw.js
 `;
+
+exports[`pages > list_pages > when dialog is open 1`] = `
+{"content":[{"type":"text","text":"# Open dialog\\nalert: test dialog.\\nCall handle_dialog to handle it before continuing.\\n## Pages\\n1: about:blank [selected]"}],"structuredContent":{"dialog":{"type":"alert","message":"test dialog","defaultValue":""},"pages":[{"id":1,"url":"about:blank","selected":true}]}}
+`;
+
+exports[`pages > navigate_page > when dialog is open 1`] = `
+{"content":[{"type":"text","text":"Successfully navigated to data:text/html,<div>Navigated</div>.\\n# Open dialog\\nalert: test dialog.\\nCall handle_dialog to handle it before continuing.\\n## Pages\\n1: data:text/html,<div>Navigated</div> [selected]"}],"structuredContent":{"message":"Successfully navigated to data:text/html,<div>Navigated</div>.","dialog":{"type":"alert","message":"test dialog","defaultValue":""},"pages":[{"id":1,"url":"data:text/html,<div>Navigated</div>","selected":true}]}}
+`;
+
+exports[`pages > new_page with isolatedContext > when dialog is open 1`] = `
+{"content":[{"type":"text","text":"# Open dialog\\nalert: test dialog.\\nCall handle_dialog to handle it before continuing.\\n## Pages\\n1: about:blank\\n2: about:blank [selected]"}],"structuredContent":{"dialog":{"type":"alert","message":"test dialog","defaultValue":""},"pages":[{"id":1,"url":"about:blank","selected":false},{"id":2,"url":"about:blank","selected":true}]}}
+`;
+
+exports[`pages > resize > when dialog is open 1`] = `
+{"content":[{"type":"text","text":"# Open dialog\\nalert: test dialog.\\nCall handle_dialog to handle it before continuing.\\n## Pages\\n1: about:blank [selected]"}],"structuredContent":{"dialog":{"type":"alert","message":"test dialog","defaultValue":""},"pages":[{"id":1,"url":"about:blank","selected":true}]}}
+`;
+
+exports[`pages > select_page > when dialog is open 1`] = `
+{"content":[{"type":"text","text":"# Open dialog\\nalert: test dialog.\\nCall handle_dialog to handle it before continuing.\\n## Pages\\n1: about:blank [selected]"}],"structuredContent":{"dialog":{"type":"alert","message":"test dialog","defaultValue":""},"pages":[{"id":1,"url":"about:blank","selected":true}]}}
+`;