feat: expose previous navigations to the MCP server

Author: Lightning00Blade

src/McpContext.ts

@@ -128,9 +128,9 @@ export class McpContext implements Context {
     return context;
   }
 
-  getNetworkRequests(): HTTPRequest[] {
+  getNetworkRequests(includePreviousNavigations?: number): HTTPRequest[] {
     const page = this.getSelectedPage();
-    return this.#networkCollector.getData(page);
+    return this.#networkCollector.getData(page, includePreviousNavigations);
   }
 
   getConsoleData(): Array<ConsoleMessage | Error> {

src/McpResponse.ts

@@ -40,6 +40,7 @@ export class McpResponse implements Response {
     include: boolean;
     pagination?: PaginationOptions;
     resourceTypes?: ResourceType[];
+    includePreviousNavigations?: number;
   };
   #consoleDataOptions?: {
     include: boolean;
@@ -60,6 +61,7 @@ export class McpResponse implements Response {
     value: boolean,
     options?: PaginationOptions & {
       resourceTypes?: ResourceType[];
+      includePreviousNavigations?: number;
     },
   ): void {
     if (!value) {
@@ -77,6 +79,7 @@ export class McpResponse implements Response {
             }
           : undefined,
       resourceTypes: options?.resourceTypes,
+      includePreviousNavigations: options?.includePreviousNavigations,
     };
   }
 
@@ -344,7 +347,9 @@ Call ${handleDialog.name} to handle it before continuing.`);
     response.push(...this.#formatConsoleData(data.consoleData));
 
     if (this.#networkRequestsOptions?.include) {
-      let requests = context.getNetworkRequests();
+      let requests = context.getNetworkRequests(
+        this.#networkRequestsOptions?.includePreviousNavigations,
+      );
 
       // Apply resource type filtering if specified
       if (this.#networkRequestsOptions.resourceTypes?.length) {

src/PageCollector.ts

@@ -133,12 +133,18 @@ export class PageCollector<T> {
     this.storage.delete(page);
   }
 
-  getData(page: Page): T[] {
+  getData(page: Page, includePreviousNavigations?: number): T[] {
     const navigations = this.storage.get(page);
     if (!navigations) {
       return [];
     }
-    return navigations[0];
+
+    const data: T[] = [];
+    for (let index = includePreviousNavigations ?? 0; index >= 0; index--) {
+      console.log('Loop index', index);
+      data.push(...navigations[index]);
+    }
+    return data;
   }
 
   getIdForResource(resource: WithSymbolId<T>): number {
@@ -168,6 +174,7 @@ export class NetworkCollector extends PageCollector<HTTPRequest> {
     super(browser, collect => {
       return {
         request: req => {
+          console.log('Collected');
           collect(req);
         },
       } as ListenerMap;
@@ -190,7 +197,7 @@ export class NetworkCollector extends PageCollector<HTTPRequest> {
     // Keep all requests since the last navigation request including that
     // navigation request itself.
     // Keep the reference
-    if (lastRequestIdx) {
+    if (lastRequestIdx !== -1) {
       const fromCurrentNavigation = requests.splice(lastRequestIdx);
       navigations.unshift(fromCurrentNavigation);
     } else {

src/tools/ToolDefinition.ts

@@ -50,6 +50,7 @@ export interface Response {
     value: boolean,
     options?: PaginationOptions & {
       resourceTypes?: string[];
+      includePreviousNavigations?: number;
     },
   ): void;
   setIncludeConsoleData(

src/tools/network.ts

@@ -63,12 +63,22 @@ export const listNetworkRequests = defineTool({
       .describe(
         'Filter requests to only return requests of the specified resource types. When omitted or empty, returns all requests.',
       ),
+    includePreviousNavigations: z
+      .number()
+      .int()
+      .positive()
+      .max(2)
+      .optional()
+      .describe(
+        'Number of previous navigations to include. Current navigation is always included.',
+      ),
   },
   handler: async (request, response) => {
     response.setIncludeNetworkRequests(true, {
       pageSize: request.params.pageSize,
       pageIdx: request.params.pageIdx,
       resourceTypes: request.params.resourceTypes,
+      includePreviousNavigations: request.params.includePreviousNavigations,
     });
   },
 });

tests/PageCollector.test.ts

@@ -250,4 +250,40 @@ describe('NetworkCollector', () => {
     assert.equal(collector.getData(page)[0], navRequest);
     assert.equal(collector.getData(page)[1], request2);
   });
+
+  it('correctly picks up after multiple back to back navigations', async () => {
+    const browser = getMockBrowser();
+    const page = (await browser.pages())[0];
+    const mainFrame = page.mainFrame();
+    const navRequest = getMockRequest({
+      navigationRequest: true,
+      frame: page.mainFrame(),
+    });
+    const navRequest2 = getMockRequest({
+      navigationRequest: true,
+      frame: page.mainFrame(),
+    });
+    const request = getMockRequest();
+
+    const collector = new NetworkCollector(browser);
+    await collector.init();
+    page.emit('request', navRequest);
+    assert.equal(collector.getData(page)[0], navRequest);
+
+    page.emit('framenavigated', mainFrame);
+    assert.equal(collector.getData(page).length, 1);
+    assert.equal(collector.getData(page)[0], navRequest);
+
+    page.emit('request', navRequest2);
+    assert.equal(collector.getData(page).length, 2);
+    assert.equal(collector.getData(page)[0], navRequest);
+    assert.equal(collector.getData(page)[1], navRequest2);
+
+    page.emit('framenavigated', mainFrame);
+    assert.equal(collector.getData(page).length, 1);
+    assert.equal(collector.getData(page)[0], navRequest2);
+
+    page.emit('request', request);
+    assert.equal(collector.getData(page).length, 2);
+  });
 });

tests/tools/network.test.js.snapshot

@@ -0,0 +1,14 @@
+exports[`network > network_list_requests > list requests form current navigations only 1`] = `
+# list_request response
+## Network requests
+Showing 1-1 of 1 (Page 1 of 1).
+reqid=3 GET data:text/html,<div>Hello 3</div> [success - 200]
+`;
+
+exports[`network > network_list_requests > list requests from previous navigations 1`] = `
+# list_request response
+## Network requests
+Showing 1-2 of 2 (Page 1 of 1).
+reqid=2 GET data:text/html,<div>Hello 2</div> [success - 200]
+reqid=3 GET data:text/html,<div>Hello 3</div> [success - 200]
+`;

tests/tools/network.test.ts

@@ -21,6 +21,45 @@ describe('network', () => {
         assert.strictEqual(response.networkRequestsPageIdx, undefined);
       });
     });
+
+    it('list requests form current navigations only', async t => {
+      await withBrowser(async (response, context) => {
+        const page = await context.getSelectedPage();
+        await page.goto('data:text/html,<div>Hello 1</div>');
+        await page.goto('data:text/html,<div>Hello 2</div>');
+        await page.goto('data:text/html,<div>Hello 3</div>');
+        await listNetworkRequests.handler(
+          {
+            params: {},
+          },
+          response,
+          context,
+        );
+        const responseData = await response.handle('list_request', context);
+        t.assert.snapshot?.(responseData[0].text);
+      });
+    });
+
+    it.only('list requests from previous navigations', async t => {
+      await withBrowser(async (response, context) => {
+        const page = await context.getSelectedPage();
+        await page.goto('data:text/html,<div>Hello 1</div>');
+        await page.goto('data:text/html,<div>Hello 2</div>');
+        console.log('Last navigtation');
+        await page.goto('data:text/html,<div>Hello 3</div>');
+        await listNetworkRequests.handler(
+          {
+            params: {
+              includePreviousNavigations: 1,
+            },
+          },
+          response,
+          context,
+        );
+        const responseData = await response.handle('list_request', context);
+        t.assert.snapshot?.(responseData[0].text);
+      });
+    });
   });
   describe('network_get_request', () => {
     it('attaches request', async () => {
@@ -32,6 +71,7 @@ describe('network', () => {
           response,
           context,
         );
+
         assert.equal(response.attachedNetworkRequestId, 1);
       });
     });