Integrate with network request

Author: OrKoN

docs/tool-reference.md

@@ -255,11 +255,12 @@
 
 ### `get_network_request`
 
-**Description:** Gets a network request by URL. You can get all requests by calling [`list_network_requests`](#list_network_requests).
+**Description:** Gets a network request by reqid. You can get all requests by calling [`list_network_requests`](#list_network_requests).
+Get the request currently selected in the DevTools UI by ommitting reqid
 
 **Parameters:**
 
-- **reqid** (number) **(required)**: The reqid of a request on the page from the listed network requests
+- **reqid** (number) _(optional)_: The reqid of the network request. If omitted, looks up the current request selected in DevTools UI.
 
 ---
 

src/McpResponse.ts

@@ -51,7 +51,6 @@ export class McpResponse implements Response {
     types?: string[];
     includePreservedMessages?: boolean;
   };
-  #includeDevtoolsData = false;
 
   setIncludePages(value: boolean): void {
     this.#includePages = value;
@@ -63,10 +62,6 @@ export class McpResponse implements Response {
     };
   }
 
-  includeDevtoolsData(value: boolean): void {
-    this.#includeDevtoolsData = value;
-  }
-
   setIncludeNetworkRequests(
     value: boolean,
     options?: PaginationOptions & {
@@ -296,17 +291,11 @@ export class McpResponse implements Response {
       );
     }
 
-    let devToolsData;
-    if (this.#includeDevtoolsData) {
-      devToolsData = await context.getDevToolsData();
-    }
-
     return this.format(toolName, context, {
       bodies,
       consoleData,
       consoleListData,
       formattedSnapshot,
-      devToolsData,
     });
   }
 
@@ -321,23 +310,13 @@ export class McpResponse implements Response {
       consoleData: ConsoleMessageData | undefined;
       consoleListData: ConsoleMessageData[] | undefined;
       formattedSnapshot: string | undefined;
-      devToolsData?: {requestId?: number};
     },
   ): Array<TextContent | ImageContent> {
     const response = [`# ${toolName} response`];
     for (const line of this.#textResponseLines) {
       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.`,
-      );
-    }
-
     const networkConditions = context.getNetworkConditions();
     if (networkConditions) {
       response.push(`## Network emulation`);

src/main.ts

@@ -21,7 +21,6 @@ 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 emulationTools from './tools/emulation.js';
 import * as inputTools from './tools/input.js';
 import * as networkTools from './tools/network.js';
@@ -170,7 +169,6 @@ function registerTool(tool: ToolDefinition): void {
 
 const tools = [
   ...Object.values(consoleTools),
-  ...Object.values(devtoolsTools),
   ...Object.values(emulationTools),
   ...Object.values(inputTools),
   ...Object.values(networkTools),

src/tools/ToolDefinition.ts

@@ -65,7 +65,6 @@ export interface Response {
     },
   ): void;
   includeSnapshot(params?: SnapshotParams): void;
-  includeDevtoolsData(value: boolean): void;
   attachImage(value: ImageContentData): void;
   attachNetworkRequest(reqid: number): void;
   attachConsoleMessage(msgid: number): void;
@@ -103,6 +102,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

@@ -82,19 +82,32 @@ 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.`,
+        );
+      }
+    }
   },
 });

src/tools/network.ts

@@ -89,7 +89,7 @@ exports[`McpResponse > list pages 1`] = `
 exports[`McpResponse > returns correctly formatted snapshot for a simple tree 1`] = `
 # test response
 ## Page content
-uid=1_0 RootWebArea "My test page" url="about:blank"
+uid=1_0 RootWebArea "My test page"
   uid=1_1 button "Click me" focusable focused
   uid=1_2 textbox value="Input"
 
@@ -98,7 +98,7 @@ uid=1_0 RootWebArea "My test page" url="about:blank"
 exports[`McpResponse > returns values for textboxes 1`] = `
 # test response
 ## Page content
-uid=1_0 RootWebArea "My test page" url="about:blank"
+uid=1_0 RootWebArea "My test page"
   uid=1_1 StaticText "username"
   uid=1_2 textbox "username" focusable focused value="mcp"
 
@@ -107,7 +107,7 @@ uid=1_0 RootWebArea "My test page" url="about:blank"
 exports[`McpResponse > returns verbose snapshot 1`] = `
 # test response
 ## Page content
-uid=1_0 RootWebArea "My test page" url="about:blank"
+uid=1_0 RootWebArea "My test page"
   uid=1_1 ignored
     uid=1_2 ignored
       uid=1_3 complementary
@@ -123,7 +123,7 @@ Saved snapshot to <file>
 `;
 
 exports[`McpResponse > saves snapshot to file 2`] = `
-uid=1_0 RootWebArea "My test page" url="about:blank"
+uid=1_0 RootWebArea "My test page"
   uid=1_1 ignored
     uid=1_2 ignored
       uid=1_3 complementary