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

@@ -44,14 +44,14 @@ export class McpResponse implements Response {
     pagination?: PaginationOptions;
     resourceTypes?: ResourceType[];
     includePreservedRequests?: boolean;
+    networkRequestIdInDevToolsUI?: number;
   };
   #consoleDataOptions?: {
     include: boolean;
     pagination?: PaginationOptions;
     types?: string[];
     includePreservedMessages?: boolean;
   };
-  #includeDevtoolsData = false;
 
   setIncludePages(value: boolean): void {
     this.#includePages = value;
@@ -63,15 +63,12 @@ export class McpResponse implements Response {
     };
   }
 
-  includeDevtoolsData(value: boolean): void {
-    this.#includeDevtoolsData = value;
-  }
-
   setIncludeNetworkRequests(
     value: boolean,
     options?: PaginationOptions & {
       resourceTypes?: ResourceType[];
       includePreservedRequests?: boolean;
+      networkRequestIdInDevToolsUI?: number;
     },
   ): void {
     if (!value) {
@@ -90,6 +87,7 @@ export class McpResponse implements Response {
           : undefined,
       resourceTypes: options?.resourceTypes,
       includePreservedRequests: options?.includePreservedRequests,
+      networkRequestIdInDevToolsUI: options?.networkRequestIdInDevToolsUI,
     };
   }
 
@@ -296,17 +294,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 +313,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`);
@@ -412,6 +394,8 @@ Call ${handleDialog.name} to handle it before continuing.`);
             getShortDescriptionForRequest(
               request,
               context.getNetworkRequestStableId(request),
+              context.getNetworkRequestStableId(request) ===
+                this.#networkRequestsOptions?.networkRequestIdInDevToolsUI,
             ),
           );
         }

src/formatters/networkFormatter.ts

@@ -13,9 +13,10 @@ const BODY_CONTEXT_SIZE_LIMIT = 10000;
 export function getShortDescriptionForRequest(
   request: HTTPRequest,
   id: number,
+  selectedInDevToolsUI = false,
 ): string {
   // TODO truncate the URL
-  return `reqid=${id} ${request.method()} ${request.url()} ${getStatusFromRequest(request)}`;
+  return `reqid=${id} ${request.method()} ${request.url()} ${getStatusFromRequest(request)}${selectedInDevToolsUI ? ` [selected in DevTools UI]` : ''}`;
 }
 
 export function getStatusFromRequest(request: HTTPRequest): string {

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

@@ -55,6 +55,7 @@ export interface Response {
     options?: PaginationOptions & {
       resourceTypes?: string[];
       includePreservedRequests?: boolean;
+      networkRequestIdInDevToolsUI?: number;
     },
   ): void;
   setIncludeConsoleData(
@@ -65,7 +66,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 +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

@@ -70,31 +70,46 @@ export const listNetworkRequests = defineTool({
         'Set to true to return the preserved requests over the last 3 navigations.',
       ),
   },
-  handler: async (request, response) => {
+  handler: async (request, response, context) => {
+    const data = await context.getDevToolsData();
     response.setIncludeNetworkRequests(true, {
       pageSize: request.params.pageSize,
       pageIdx: request.params.pageIdx,
       resourceTypes: request.params.resourceTypes,
       includePreservedRequests: request.params.includePreservedRequests,
+      networkRequestIdInDevToolsUI: data?.requestId,
     });
   },
 });
 
 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

@@ -71,6 +71,16 @@ describe('networkFormatter', () => {
         'reqid=1 GET http://example.com [failed - Error in Network]',
       );
     });
+
+    it('marks requests selected in DevTools UI', async () => {
+      const request = getMockRequest();
+      const result = getShortDescriptionForRequest(request, 1, true);
+
+      assert.equal(
+        result,
+        'reqid=1 GET http://example.com [pending] [selected in DevTools UI]',
+      );
+    });
   });
 
   describe('getFormattedHeaderValue', () => {