Integrate with network request

Author: OrKoN

src/McpResponse.ts

@@ -329,14 +329,15 @@ export class McpResponse implements Response {
       response.push(line);
     }
 
-    response.push('## Network requests inspected in DevTools');
-    if (data.devToolsData?.requestId) {
-      response.push(`Network request: reqid=${data.devToolsData?.requestId}`);
-    } else {
-      response.push(
-        `Nothing inspected right now. Call list_pages to check if anything is selected by the user in DevTools.`,
-      );
-    }
+    // if (data.devToolsData?.requestId) {
+    //   response.push('## Network requests inspected in DevTools');
+    //   response.push(`Network request: reqid=${data.devToolsData?.requestId}`);
+    // } else {
+    //   response.push('## Network requests inspected in DevTools');
+    //   response.push(
+    //     `Nothing inspected right now. Call list_pages to check if anything is selected by the user in DevTools.`,
+    //   );
+    // }
 
     const networkConditions = context.getNetworkConditions();
     if (networkConditions) {

src/main.ts

@@ -21,7 +21,7 @@ import {
 } from './third_party/index.js';
 import {ToolCategory} from './tools/categories.js';
 import * as consoleTools from './tools/console.js';
-import * as devtoolsTools from './tools/devtools.js';
+// import * as devtoolsTools from './tools/devtools.js';
 import * as emulationTools from './tools/emulation.js';
 import * as inputTools from './tools/input.js';
 import * as networkTools from './tools/network.js';
@@ -170,7 +170,7 @@ function registerTool(tool: ToolDefinition): void {
 
 const tools = [
   ...Object.values(consoleTools),
-  ...Object.values(devtoolsTools),
+  // ...Object.values(devtoolsTools),
   ...Object.values(emulationTools),
   ...Object.values(inputTools),
   ...Object.values(networkTools),

src/tools/ToolDefinition.ts

@@ -103,6 +103,7 @@ export type Context = Readonly<{
     text: string;
     timeout?: number | undefined;
   }): Promise<Element>;
+  getDevToolsData(): Promise<undefined | {requestId?: number}>;
 }>;
 
 export function defineTool<Schema extends zod.ZodRawShape>(

src/tools/devtools.ts

@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {ToolCategory} from './categories.js';
-import {defineTool} from './ToolDefinition.js';
+// import {ToolCategory} from './categories.js';
+// import {defineTool} from './ToolDefinition.js';
 
-export const emulateNetwork = defineTool({
-  name: 'list_devtools_data',
-  description: `Returns data (network requests) that the user is currently inspecting in DevTools.`,
-  annotations: {
-    category: ToolCategory.DEBUGGING,
-    readOnlyHint: true,
-  },
-  schema: {},
-  handler: async (_request, response, _context) => {
-    response.includeDevtoolsData(true);
-  },
-});
+// export const listDevToolsData = defineTool({
+//   name: 'list_devtools_data',
+//   description: `Returns data (network requests) that the user is currently inspecting in DevTools.`,
+//   annotations: {
+//     category: ToolCategory.DEBUGGING,
+//     readOnlyHint: true,
+//   },
+//   schema: {},
+//   handler: async (_request, response, _context) => {
+//     response.includeDevtoolsData(true);
+//   },
+// });

src/tools/network.ts

@@ -82,19 +82,30 @@ export const listNetworkRequests = defineTool({
 
 export const getNetworkRequest = defineTool({
   name: 'get_network_request',
-  description: `Gets a network request by URL. You can get all requests by calling ${listNetworkRequests.name}.`,
+  description: `Gets a network request by reqid. You can get all requests by calling ${listNetworkRequests.name}.
+Get the request currently selected in the DevTools UI by ommitting reqid`,
   annotations: {
     category: ToolCategory.NETWORK,
     readOnlyHint: true,
   },
   schema: {
     reqid: zod
       .number()
+      .optional()
       .describe(
-        'The reqid of a request on the page from the listed network requests',
+        'The reqid of the network request. If omitted, looks up the current request selected in DevTools UI.',
       ),
   },
-  handler: async (request, response, _context) => {
-    response.attachNetworkRequest(request.params.reqid);
+  handler: async (request, response, context) => {
+    if (request.params.reqid) {
+      response.attachNetworkRequest(request.params.reqid);
+    } else {
+      const data = await context.getDevToolsData();
+      if (data?.requestId) {
+        response.attachNetworkRequest(data?.requestId);
+      } else {
+        response.appendResponseLine(`Nothing is currently selected in DevTools UI.`)
+      }
+    }
   },
 });