chore: pass args to McpResponse

Author: nroscino

src/McpResponse.ts

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import type {ParsedArguments} from './cli.js';
 import {ConsoleFormatter} from './formatters/ConsoleFormatter.js';
 import {IssueFormatter} from './formatters/IssueFormatter.js';
 import {NetworkFormatter} from './formatters/NetworkFormatter.js';
@@ -66,6 +67,11 @@ export class McpResponse implements Response {
   #listExtensions?: boolean;
   #devToolsData?: DevToolsData;
   #tabId?: string;
+  #args: ParsedArguments;
+
+  constructor(args: ParsedArguments) {
+    this.#args = args;
+  }
 
   attachDevToolsData(data: DevToolsData): void {
     this.#devToolsData = data;
@@ -75,10 +81,10 @@ export class McpResponse implements Response {
     this.#tabId = tabId;
   }
 
-  setIncludePages(value: boolean, includeServiceWorkers?: boolean): void {
+  setIncludePages(value: boolean): void {
     this.#includePages = value;
 
-    if (includeServiceWorkers) {
+    if (this.#args.categoryExtensions) {
       this.#includeExtensionServiceWorkers = value;
     }
   }

src/main.ts

@@ -203,7 +203,10 @@ function registerTool(tool: ToolDefinition): void {
         const context = await getContext();
         logger(`${tool.name} context: resolved`);
         await context.detectOpenDevToolsWindows();
-        const response = args.slim ? new SlimMcpResponse() : new McpResponse();
+        const response = args.slim
+          ? new SlimMcpResponse(args)
+          : new McpResponse(args);
+
         await tool.handler(
           {
             params,

src/tools/ToolDefinition.ts

@@ -63,7 +63,7 @@ export interface DevToolsData {
 
 export interface Response {
   appendResponseLine(value: string): void;
-  setIncludePages(value: boolean, shouldIncludeExtension?: boolean): void;
+  setIncludePages(value: boolean): void;
   setIncludeNetworkRequests(
     value: boolean,
     options?: PaginationOptions & {

src/tools/pages.ts

@@ -21,7 +21,7 @@ export const listPages = defineTool(args => {
     },
     schema: {},
     handler: async (_request, response) => {
-      response.setIncludePages(true, args?.categoryExtensions);
+      response.setIncludePages(true);
     },
   };
 });

tests/tools/console.test.ts

@@ -7,6 +7,7 @@
 import assert from 'node:assert';
 import {before, describe, it} from 'node:test';
 
+import type {ParsedArguments} from '../../src/cli.js';
 import {loadIssueDescriptions} from '../../src/issue-descriptions.js';
 import {McpResponse} from '../../src/McpResponse.js';
 import {DevTools} from '../../src/third_party/index.js';
@@ -170,7 +171,7 @@ describe('console', () => {
           await context.createTextSnapshot();
           await issuePromise;
           await listConsoleMessages.handler({params: {}}, response, context);
-          const response2 = new McpResponse();
+          const response2 = new McpResponse({} as ParsedArguments);
           await getConsoleMessage.handler(
             {params: {msgid: 1}},
             response2,
@@ -225,7 +226,7 @@ describe('console', () => {
             response,
             context,
           );
-          const response2 = new McpResponse();
+          const response2 = new McpResponse({} as ParsedArguments);
           await getConsoleMessage.handler(
             {params: {msgid: id}},
             response2,

tests/tools/input.test.ts

@@ -9,6 +9,7 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import {describe, it} from 'node:test';
 
+import type {ParsedArguments} from '../../src/cli.js';
 import {McpResponse} from '../../src/McpResponse.js';
 import {
   click,
@@ -514,7 +515,7 @@ describe('input', () => {
         await context.createTextSnapshot();
 
         // Fill email
-        const response1 = new McpResponse();
+        const response1 = new McpResponse({} as ParsedArguments);
         await fill.handler(
           {
             params: {
@@ -531,7 +532,7 @@ describe('input', () => {
         );
 
         // Fill password
-        const response2 = new McpResponse();
+        const response2 = new McpResponse({} as ParsedArguments);
         await fill.handler(
           {
             params: {

tests/tools/pages.test.ts

@@ -44,47 +44,53 @@ describe('pages', () => {
     });
     for (const categoryExtensions of [true, false]) {
       it(`list pages ${categoryExtensions ? 'with' : 'without'} --category-extensions`, async () => {
-        await withMcpContext(async (response, context) => {
-          await installExtension.handler(
-            {params: {path: EXTENSION_PATH}},
-            response,
-            context,
-          );
+        await withMcpContext(
+          async (response, context) => {
+            await installExtension.handler(
+              {params: {path: EXTENSION_PATH}},
+              response,
+              context,
+            );
 
-          const swTarget = await context.browser.waitForTarget(
-            t =>
-              t.type() === 'service_worker' &&
-              t.url().includes('chrome-extension://'),
-          );
-          const swUrl = swTarget.url();
+            const swTarget = await context.browser.waitForTarget(
+              t =>
+                t.type() === 'service_worker' &&
+                t.url().includes('chrome-extension://'),
+            );
+            const swUrl = swTarget.url();
 
-          response.resetResponseLineForTesting();
+            response.resetResponseLineForTesting();
 
-          const listPageDef = listPages({
-            categoryExtensions,
-          } as ParsedArguments);
-          await listPageDef.handler({params: {}}, response, context);
-
-          const result = await response.handle(listPageDef.name, context);
-          const textContent = result.content.find(c => c.type === 'text') as {
-            type: 'text';
-            text: string;
-          };
-          assert.ok(textContent);
-
-          if (categoryExtensions) {
-            assert.ok(textContent.text.includes(swUrl));
-            const structured = result.structuredContent as {
-              extensionServiceWorkers: Array<{url: string}>;
+            const listPageDef = listPages({
+              categoryExtensions,
+            } as ParsedArguments);
+            await listPageDef.handler({params: {}}, response, context);
+
+            const result = await response.handle(listPageDef.name, context);
+            const textContent = result.content.find(c => c.type === 'text') as {
+              type: 'text';
+              text: string;
             };
-            assert.deepStrictEqual(
-              structured.extensionServiceWorkers.map(sw => sw.url),
-              [swUrl],
-            );
-          } else {
-            assert.ok(!textContent.text.includes(swUrl));
-          }
-        });
+            assert.ok(textContent);
+
+            if (categoryExtensions) {
+              assert.ok(textContent.text.includes(swUrl));
+              const structured = result.structuredContent as {
+                extensionServiceWorkers: Array<{url: string}>;
+              };
+              assert.deepStrictEqual(
+                structured.extensionServiceWorkers.map(sw => sw.url),
+                [swUrl],
+              );
+            } else {
+              assert.ok(!textContent.text.includes(swUrl));
+            }
+          },
+          {},
+          {
+            categoryExtensions,
+          } as ParsedArguments,
+        );
       });
     }
   });

tests/utils.ts

@@ -17,6 +17,7 @@ import type {
 } from 'puppeteer-core';
 import sinon from 'sinon';
 
+import type {ParsedArguments} from '../src/cli.js';
 import {McpContext} from '../src/McpContext.js';
 import {McpResponse} from '../src/McpResponse.js';
 import {stableIdSymbol} from '../src/PageCollector.js';
@@ -85,9 +86,10 @@ export async function withMcpContext(
     autoOpenDevTools?: boolean;
     performanceCrux?: boolean;
   } = {},
+  args: ParsedArguments = {} as ParsedArguments,
 ) {
   await withBrowser(async browser => {
-    const response = new McpResponse();
+    const response = new McpResponse(args);
     if (context) {
       context.dispose();
     }