chore: self review

Author: nroscino

src/McpContext.ts

@@ -109,7 +109,7 @@ export class McpContext implements Context {
     null;
 
   #nextPageId = 1;
-  #extensionPopupPages = new WeakMap<Target, Page>();
+  #extensionPages = new WeakMap<Target, Page>();
 
   #extensionServiceWorkerMap = new WeakMap<Target, string>();
   #nextExtensionServiceWorkerId = 1;
@@ -559,7 +559,7 @@ export class McpContext implements Context {
   async createPagesSnapshot(): Promise<Page[]> {
     const {pages: allPages, isolatedContextNames} = await this.#getAllPages();
 
-    const allTargets = await this.browser.targets();
+    const allTargets = this.browser.targets();
     const extensionTargets = allTargets.filter(target => {
       return (
         target.url().startsWith('chrome-extension://') &&
@@ -570,11 +570,11 @@ export class McpContext implements Context {
     for (const target of extensionTargets) {
       let page = await target.page();
       if (!page) {
-        page = this.#extensionPopupPages.get(target) ?? null;
+        page = this.#extensionPages.get(target) ?? null;
         if (!page) {
           try {
             page = await target.asPage();
-            this.#extensionPopupPages.set(target, page);
+            this.#extensionPages.set(target, page);
           } catch (e) {
             this.logger('Failed to get page for extension target', e);
           }

src/McpResponse.ts

@@ -16,6 +16,7 @@ import {DevTools} from './third_party/index.js';
 import type {
   ConsoleMessage,
   ImageContent,
+  Page,
   ResourceType,
   TextContent,
 } from './third_party/index.js';
@@ -568,9 +569,19 @@ Call ${handleDialog.name} to handle it before continuing.`);
 
     if (this.#includePages) {
       const allPages = context.getPages();
-      const regularPages = this.#includeExtensionPages
-        ? allPages.filter(p => !p.url().startsWith('chrome-extension://'))
-        : allPages;
+
+      // Use reduce to separate extension pages and normal pages
+      const {regularPages, extensionPages} = allPages.reduce(
+        (acc: {regularPages: Page[]; extensionPages: Page[]}, page: Page) => {
+          if (page.url().startsWith('chrome-extension://')) {
+            acc.extensionPages.push(page);
+          } else {
+            acc.regularPages.push(page);
+          }
+          return acc;
+        },
+        {regularPages: [], extensionPages: []},
+      );
 
       if (regularPages.length) {
         const parts = [`## Pages`];
@@ -604,9 +615,6 @@ Call ${handleDialog.name} to handle it before continuing.`);
       }
 
       if (this.#includeExtensionPages) {
-        const extensionPages = allPages.filter(p =>
-          p.url().startsWith('chrome-extension://'),
-        );
         if (extensionPages.length) {
           response.push(`## Extension Pages`);
           for (const page of extensionPages) {