Address feedback | part 2

Author: beaufortfrancois

src/McpResponse.ts

@@ -381,6 +381,10 @@ export class McpResponse implements Response {
     return this.#snapshotParams;
   }
 
+  get listWebMcpTools(): boolean | undefined {
+    return this.#listWebMcpTools;
+  }
+
   async handle(
     toolName: string,
     context: McpContext,

tests/McpResponse.test.js.snapshot

@@ -1362,6 +1362,25 @@ exports[`webmcp > includes webmcp tools in select_page response 2`] = `
 }
 `;
 
+exports[`webmcp > list no webmcp tools if experimentalWebmcp is false 1`] = `
+Successfully navigated to about:blank.
+## Pages
+1: about:blank [selected]
+`;
+
+exports[`webmcp > list no webmcp tools if experimentalWebmcp is false 2`] = `
+{
+  "message": "Successfully navigated to about:blank.",
+  "pages": [
+    {
+      "id": 1,
+      "url": "about:blank",
+      "selected": true
+    }
+  ]
+}
+`;
+
 exports[`webmcp > list no webmcp tools if there are none 1`] = `
 ## WebMCP tools
 No WebMCP tools available.

tests/McpResponse.test.ts

@@ -1459,6 +1459,7 @@ describe('replaceHtmlElementsWithUids', () => {
 describe('webmcp', () => {
   async function testIncludesWebmcpTools(
     t: it.TestContext,
+    parseArguments: ParsedArguments,
     handlerAction: (
       response: McpResponse,
       context: McpContext,
@@ -1470,7 +1471,7 @@ describe('webmcp', () => {
         response.setListWebMcpTools();
 
         await handlerAction(response, context);
-        
+
         const page = context.getSelectedMcpPage().pptrPage;
         await page.setContent(
           html`<form
@@ -1494,13 +1495,14 @@ describe('webmcp', () => {
         );
       },
       {args: ['--enable-features=WebMCPTesting,DevToolsWebMCPSupport']},
-      {experimentalWebmcp: true} as ParsedArguments,
+      parseArguments,
     );
   }
 
   it('includes webmcp tools in list_pages response', async t => {
     await testIncludesWebmcpTools(
       t,
+      {experimentalWebmcp: true} as ParsedArguments,
       async (response, context) => {
         await listPages().handler({params: {}}, response, context);
       },
@@ -1511,6 +1513,7 @@ describe('webmcp', () => {
   it('includes webmcp tools in select_page response', async t => {
     await testIncludesWebmcpTools(
       t,
+      {experimentalWebmcp: true} as ParsedArguments,
       async (response, context) => {
         const pageId =
           context.getPageId(context.getSelectedMcpPage().pptrPage) ?? 1;
@@ -1523,6 +1526,7 @@ describe('webmcp', () => {
   it('includes webmcp tools in navigate_page response', async t => {
     await testIncludesWebmcpTools(
       t,
+      {experimentalWebmcp: true} as ParsedArguments,
       async (response, context) => {
         await navigatePage.handler(
           {
@@ -1559,4 +1563,22 @@ describe('webmcp', () => {
       {experimentalWebmcp: true} as ParsedArguments,
     );
   });
+
+  it('list no webmcp tools if experimentalWebmcp is false', async t => {
+    await testIncludesWebmcpTools(
+      t,
+      {experimentalWebmcp: false} as ParsedArguments,
+      async (response, context) => {
+        await navigatePage.handler(
+          {
+            params: {type: 'url', url: 'about:blank'},
+            page: context.getSelectedMcpPage(),
+          },
+          response,
+          context,
+        );
+      },
+      'navigate_page',
+    );
+  });
 });

tests/tools/webmcp.test.ts

@@ -7,80 +7,34 @@
 import assert from 'node:assert';
 import {describe, it} from 'node:test';
 
-import type {ParsedArguments} from '../../src/bin/chrome-devtools-mcp-cli-options.js';
-import {listWebMcpTools} from '../../src/tools/webmcp.js';
-import {getTextContent, html, withMcpContext} from '../utils.js';
+import {listPages, navigatePage, selectPage} from '../../src/tools/pages.js';
+import {withMcpContext} from '../utils.js';
 
 describe('webmcp', () => {
-  it('list webmcp tools successfully', async () => {
-    await withMcpContext(
-      async (response, context) => {
-        const page = context.getSelectedMcpPage().pptrPage;
-        await page.setContent(
-          html`<form
-            toolname="test_tool"
-            tooldescription="A test tool"
-          ></form>`,
-        );
-
-        await listWebMcpTools.handler(
-          {params: {}, page: context.getSelectedMcpPage()},
-          response,
-          context,
-        );
-
-        const formattedResponse = await response.handle('test', context);
-        const textContent = getTextContent(formattedResponse.content[0]);
-        assert.match(
-          textContent,
-          /name="test_tool", description="A test tool"/,
-        );
-      },
-      {args: ['--enable-features=WebMCPTesting,DevToolsWebMCPSupport']},
-      {experimentalWebmcp: true} as ParsedArguments,
-    );
+  it('list webmcp tools in navigate_page response', async () => {
+    await withMcpContext(async (response, context) => {
+      await navigatePage.handler(
+        {params: {url: 'about:blank'}, page: context.getSelectedMcpPage()},
+        response,
+        context,
+      );
+      assert.ok(response.listWebMcpTools);
+    });
   });
 
-  it('list no webmcp tools if there are none', async () => {
-    await withMcpContext(
-      async (response, context) => {
-        await listWebMcpTools.handler(
-          {params: {}, page: context.getSelectedMcpPage()},
-          response,
-          context,
-        );
-
-        const formattedResponse = await response.handle('test', context);
-        const textContent = getTextContent(formattedResponse.content[0]);
-        assert.match(textContent, /No WebMCP tools available/);
-      },
-      {args: ['--enable-features=WebMCPTesting,DevToolsWebMCPSupport']},
-      {experimentalWebmcp: true} as ParsedArguments,
-    );
+  it('list webmcp tools in list_pages response', async () => {
+    await withMcpContext(async (response, context) => {
+      await listPages().handler({params: {}}, response, context);
+      assert.ok(response.listWebMcpTools);
+    });
   });
 
-  it('does not list webmcp tools if not enabled', async () => {
-    await withMcpContext(
-      async (response, context) => {
-        const page = context.getSelectedMcpPage().pptrPage;
-        await page.setContent(
-          html`<form
-            toolname="test_tool"
-            tooldescription="A test tool"
-          ></form>`,
-        );
-
-        await listWebMcpTools.handler(
-          {params: {}, page: context.getSelectedMcpPage()},
-          response,
-          context,
-        );
-
-        const formattedResponse = await response.handle('test', context);
-        const textContent = getTextContent(formattedResponse.content[0]);
-        assert.ok(!textContent.includes('name="test_tool"'));
-      },
-      {args: ['--enable-features=WebMCPTesting,DevToolsWebMCPSupport']},
-    );
+  it('list webmcp tools in select_page response', async () => {
+    await withMcpContext(async (response, context) => {
+      const pageId =
+        context.getPageId(context.getSelectedMcpPage().pptrPage) ?? 1;
+      await selectPage.handler({params: {pageId}}, response, context);
+      assert.ok(response.listWebMcpTools);
+    });
   });
 });