Merge branch 'main' into main

Author: sntaoo

package-lock.json

@@ -52,7 +52,7 @@
     "@types/yargs": "^17.0.33",
     "@typescript-eslint/eslint-plugin": "^8.43.0",
     "@typescript-eslint/parser": "^8.43.0",
-    "chrome-devtools-frontend": "1.0.1543472",
+    "chrome-devtools-frontend": "1.0.1544076",
     "core-js": "3.46.0",
     "debug": "4.4.3",
     "eslint": "^9.35.0",

package.json

@@ -63,7 +63,7 @@ export const i18n = {
     return str;
   },
   lockedLazyString: () => {},
-  getLazilyComputedLocalizedString: () => {},
+  getLazilyComputedLocalizedString: () => ()=>{},
 };
 
 // TODO(jacktfranklin): once the DocumentLatency insight does not depend on
@@ -169,6 +169,15 @@ export const hostConfig = {};
   fs.copyFileSync(devtoolsLicenseFileSource, devtoolsLicenseFileDestination);
 
   copyThirdPartyLicenseFiles();
+  copyDevToolsDescriptionFiles();
+}
+
+function copyDevToolsDescriptionFiles() {
+  const devtoolsIssuesDescriptionPath =
+    'node_modules/chrome-devtools-frontend/front_end/models/issues_manager/descriptions';
+  const sourceDir = path.join(process.cwd(), devtoolsIssuesDescriptionPath);
+  const destDir = path.join(BUILD_DIR, devtoolsIssuesDescriptionPath);
+  fs.cpSync(sourceDir, destDir, {recursive: true});
 }
 
 main();

scripts/post-build.ts

@@ -3,6 +3,13 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+
+import {
+  type Issue,
+  type IssuesManagerEventTypes,
+  Common,
+} from '../node_modules/chrome-devtools-frontend/mcp/mcp.js';
+
 export function extractUrlLikeFromDevToolsTitle(
   title: string,
 ): string | undefined {
@@ -49,3 +56,14 @@ function normalizeUrl(url: string): string {
 
   return result;
 }
+
+/**
+ * A mock implementation of an issues manager that only implements the methods
+ * that are actually used by the IssuesAggregator
+ */
+export class FakeIssuesManager extends Common.ObjectWrapper
+  .ObjectWrapper<IssuesManagerEventTypes> {
+  issues(): Issue[] {
+    return [];
+  }
+}

src/DevtoolsUtils.ts

@@ -7,9 +7,11 @@ import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 
+import {type AggregatedIssue} from '../node_modules/chrome-devtools-frontend/mcp/mcp.js';
+
 import {extractUrlLikeFromDevToolsTitle, urlsEqual} from './DevtoolsUtils.js';
 import type {ListenerMap} from './PageCollector.js';
-import {NetworkCollector, PageCollector} from './PageCollector.js';
+import {NetworkCollector, ConsoleCollector} from './PageCollector.js';
 import {Locator} from './third_party/index.js';
 import type {
   Browser,
@@ -92,7 +94,7 @@ export class McpContext implements Context {
   // The most recent snapshot.
   #textSnapshot: TextSnapshot | null = null;
   #networkCollector: NetworkCollector;
-  #consoleCollector: PageCollector<ConsoleMessage | Error>;
+  #consoleCollector: ConsoleCollector;
 
   #isRunningTrace = false;
   #networkConditionsMap = new WeakMap<Page, string>();
@@ -122,7 +124,7 @@ export class McpContext implements Context {
       this.#options.experimentalIncludeAllPages,
     );
 
-    this.#consoleCollector = new PageCollector(
+    this.#consoleCollector = new ConsoleCollector(
       this.browser,
       collect => {
         return {
@@ -138,6 +140,9 @@ export class McpContext implements Context {
               collect(error);
             }
           },
+          issue: event => {
+            collect(event);
+          },
         } as ListenerMap;
       },
       this.#options.experimentalIncludeAllPages,
@@ -150,6 +155,11 @@ export class McpContext implements Context {
     await this.#consoleCollector.init();
   }
 
+  dispose() {
+    this.#networkCollector.dispose();
+    this.#consoleCollector.dispose();
+  }
+
   static async from(
     browser: Browser,
     logger: Debugger,
@@ -205,16 +215,18 @@ export class McpContext implements Context {
 
   getConsoleData(
     includePreservedMessages?: boolean,
-  ): Array<ConsoleMessage | Error> {
+  ): Array<ConsoleMessage | Error | AggregatedIssue> {
     const page = this.getSelectedPage();
     return this.#consoleCollector.getData(page, includePreservedMessages);
   }
 
-  getConsoleMessageStableId(message: ConsoleMessage | Error): number {
+  getConsoleMessageStableId(
+    message: ConsoleMessage | Error | AggregatedIssue,
+  ): number {
     return this.#consoleCollector.getIdForResource(message);
   }
 
-  getConsoleMessageById(id: number): ConsoleMessage | Error {
+  getConsoleMessageById(id: number): ConsoleMessage | Error | AggregatedIssue {
     return this.#consoleCollector.getById(this.getSelectedPage(), id);
   }
 

src/McpContext.ts

@@ -3,6 +3,12 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import {
+  AggregatedIssue,
+  Marked,
+  findTitleFromMarkdownAst,
+} from '../node_modules/chrome-devtools-frontend/mcp/mcp.js';
+
 import type {ConsoleMessageData} from './formatters/consoleFormatter.js';
 import {
   formatConsoleEventShort,
@@ -16,6 +22,8 @@ import {
   getStatusFromRequest,
 } from './formatters/networkFormatter.js';
 import {formatSnapshotNode} from './formatters/snapshotFormatter.js';
+import {getIssueDescription} from './issue-descriptions.js';
+import {logger} from './logger.js';
 import type {McpContext} from './McpContext.js';
 import type {
   ConsoleMessage,
@@ -269,40 +277,70 @@ export class McpResponse implements Response {
           if ('type' in message) {
             return normalizedTypes.has(message.type());
           }
+          if (message instanceof AggregatedIssue) {
+            return normalizedTypes.has('issue');
+          }
           return normalizedTypes.has('error');
         });
       }
 
-      consoleListData = await Promise.all(
-        messages.map(async (item): Promise<ConsoleMessageData> => {
-          const consoleMessageStableId =
-            context.getConsoleMessageStableId(item);
-          if ('args' in item) {
-            const consoleMessage = item as ConsoleMessage;
+      consoleListData = (
+        await Promise.all(
+          messages.map(async (item): Promise<ConsoleMessageData | null> => {
+            const consoleMessageStableId =
+              context.getConsoleMessageStableId(item);
+            if ('args' in item) {
+              const consoleMessage = item as ConsoleMessage;
+              return {
+                consoleMessageStableId,
+                type: consoleMessage.type(),
+                message: consoleMessage.text(),
+                args: await Promise.all(
+                  consoleMessage.args().map(async arg => {
+                    const stringArg = await arg.jsonValue().catch(() => {
+                      // Ignore errors.
+                    });
+                    return typeof stringArg === 'object'
+                      ? JSON.stringify(stringArg)
+                      : String(stringArg);
+                  }),
+                ),
+              };
+            }
+            if (item instanceof AggregatedIssue) {
+              const count = item.getAggregatedIssuesCount();
+              const filename = item.getDescription()?.file;
+              const rawMarkdown = filename
+                ? getIssueDescription(filename)
+                : null;
+              if (!rawMarkdown) {
+                logger(`no markdown ${filename} found for issue:` + item.code);
+                return null;
+              }
+              const markdownAst = Marked.Marked.lexer(rawMarkdown);
+              const title = findTitleFromMarkdownAst(markdownAst);
+              if (!title) {
+                logger('cannot read issue title from ' + filename);
+                return null;
+              }
+              return {
+                consoleMessageStableId,
+                type: 'issue',
+                item,
+                message: title,
+                count,
+                args: [],
+              };
+            }
             return {
               consoleMessageStableId,
-              type: consoleMessage.type(),
-              message: consoleMessage.text(),
-              args: await Promise.all(
-                consoleMessage.args().map(async arg => {
-                  const stringArg = await arg.jsonValue().catch(() => {
-                    // Ignore errors.
-                  });
-                  return typeof stringArg === 'object'
-                    ? JSON.stringify(stringArg)
-                    : String(stringArg);
-                }),
-              ),
+              type: 'error',
+              message: (item as Error).message,
+              args: [],
             };
-          }
-          return {
-            consoleMessageStableId,
-            type: 'error',
-            message: (item as Error).message,
-            args: [],
-          };
-        }),
-      );
+          }),
+        )
+      ).filter(item => item !== null);
     }
 
     return this.format(toolName, context, {