Chrome DevTools for coding agents
refactor: move dialog handling to McpPage (#1059)
Alex Rudenko40c241bbfc80
diff --git a/src/McpContext.ts b/src/McpContext.tsindex 65c6b067..76cbfdbd 100644--- a/src/McpContext.ts+++ b/src/McpContext.ts@@ -23,7 +23,6 @@ import type {BrowserContext,ConsoleMessage,Debugger,- Dialog,ElementHandle,HTTPRequest,Page,@@ -205,7 +204,7 @@ export class McpContext implements Context {}#resolveTargetPage(): Page {- return this.#requestPage?.pptrPage ?? this.getSelectedPage();+ return this.#requestPage?.pptrPage ?? this.getSelectedPptrPage();}resolveCdpRequestId(cdpRequestId: string): number | undefined {@@ -327,7 +326,7 @@ export class McpContext implements Context {}async restoreEmulation(targetPage?: Page) {- const page = targetPage ?? this.getSelectedPage();+ const page = targetPage ?? this.getSelectedPptrPage();const mcpPage = this.#getMcpPage(page);const currentSetting = mcpPage.emulationSettings;await this.emulate(currentSetting, targetPage);@@ -344,7 +343,7 @@ export class McpContext implements Context {},targetPage?: Page,): Promise<void> {- const page = targetPage ?? this.getSelectedPage();+ const page = targetPage ?? this.getSelectedPptrPage();const mcpPage = this.#getMcpPage(page);const newSettings: EmulationSettings = {...mcpPage.emulationSettings};let timeoutsNeedUpdate = false;@@ -492,23 +491,7 @@ export class McpContext implements Context {return this.#options.performanceCrux;}- getDialog(page?: Page): Dialog | undefined {- const targetPage =- page ?? this.#requestPage?.pptrPage ?? this.#selectedPage;- if (!targetPage) {- return undefined;- }- return this.#mcpPages.get(targetPage)?.dialog;- }-- clearDialog(page?: Page): void {- const targetPage = page ?? this.#selectedPage;- if (targetPage) {- this.#mcpPages.get(targetPage)?.clearDialog();- }- }-- getSelectedPage(): Page {+ getSelectedPptrPage(): Page {const page = this.#selectedPage;if (!page) {throw new Error('No page selected');@@ -522,7 +505,7 @@ export class McpContext implements Context {}getSelectedMcpPage(): McpPage {- const page = this.getSelectedPage();+ const page = this.getSelectedPptrPage();return this.#getMcpPage(page);}@@ -555,7 +538,7 @@ export class McpContext implements Context {}#getSelectedMcpPage(): McpPage {- return this.#getMcpPage(this.getSelectedPage());+ return this.#getMcpPage(this.getSelectedPptrPage());}isPageSelected(page: Page): boolean {@@ -595,7 +578,7 @@ export class McpContext implements Context {}#updateSelectedPageTimeouts() {- const page = this.getSelectedPage();+ const page = this.getSelectedPptrPage();// For waiters 5sec timeout should be sufficient.// Increased in case we throttle the CPUconst cpuMultiplier = this.getCpuThrottlingRate();@@ -922,7 +905,7 @@ export class McpContext implements Context {devtoolsData: DevToolsData | undefined = undefined,targetPage?: Page,): Promise<void> {- const page = targetPage ?? this.getSelectedPage();+ const page = targetPage ?? this.getSelectedPptrPage();const mcpPage = this.#getMcpPage(page);const rootNode = await page.accessibility.snapshot({includeIframes: true,@@ -1063,7 +1046,7 @@ export class McpContext implements Context {action: () => Promise<unknown>,options?: {timeout?: number},): Promise<void> {- const page = this.getSelectedPage();+ const page = this.getSelectedPptrPage();const cpuMultiplier = this.getCpuThrottlingRate();const networkMultiplier = getNetworkMultiplierFromString(this.getNetworkConditions(),@@ -1085,7 +1068,7 @@ export class McpContext implements Context {timeout?: number,targetPage?: Page,): Promise<Element> {- const page = targetPage ?? this.getSelectedPage();+ const page = targetPage ?? this.getSelectedPptrPage();const frames = page.frames();let locator = this.#locatorClass.race(diff --git a/src/McpPage.ts b/src/McpPage.tsindex fb23a5f4..73717464 100644--- a/src/McpPage.ts+++ b/src/McpPage.ts@@ -59,6 +59,10 @@ export class McpPage implements ContextPage {return this.#dialog;}+ getDialog(): Dialog | undefined {+ return this.dialog;+ }+clearDialog(): void {this.#dialog = undefined;}diff --git a/src/McpResponse.ts b/src/McpResponse.tsindex 5cbea123..9a0f1913 100644--- a/src/McpResponse.ts+++ b/src/McpResponse.ts@@ -10,6 +10,7 @@ import {IssueFormatter} from './formatters/IssueFormatter.js';import {NetworkFormatter} from './formatters/NetworkFormatter.js';import {SnapshotFormatter} from './formatters/SnapshotFormatter.js';import type {McpContext} from './McpContext.js';+import type {McpPage} from './McpPage.js';import {UncaughtError} from './PageCollector.js';import {DevTools} from './third_party/index.js';import type {@@ -70,11 +71,16 @@ export class McpResponse implements Response {#devToolsData?: DevToolsData;#tabId?: string;#args: ParsedArguments;+ #page?: McpPage;constructor(args: ParsedArguments) {this.#args = args;}+ setPage(page: McpPage): void {+ this.#page = page;+ }+attachDevToolsData(data: DevToolsData): void {this.#devToolsData = data;}@@ -517,7 +523,7 @@ export class McpResponse implements Response {structuredContent.colorScheme = colorScheme;}- const dialog = context.getDialog();+ const dialog = this.#page?.getDialog();if (dialog) {const defaultValueIfNeeded =dialog.type() === 'prompt'diff --git a/src/server.ts b/src/server.tsindex ec0df370..02c0cac2 100644--- a/src/server.ts+++ b/src/server.ts@@ -153,7 +153,8 @@ export async function createMcpServer(const schema ='pageScoped' in tool &&tool.pageScoped &&- serverArgs.experimentalPageIdRouting+ serverArgs.experimentalPageIdRouting &&+ !serverArgs.slim? {...tool.schema, ...pageIdSchema}: tool.schema;@@ -179,10 +180,13 @@ export async function createMcpServer(try {if ('pageScoped' in tool && tool.pageScoped) {const page =- serverArgs.experimentalPageIdRouting && params.pageId+ serverArgs.experimentalPageIdRouting &&+ params.pageId &&+ !serverArgs.slim? context.resolvePageById(params.pageId): context.getSelectedMcpPage();context.setRequestPage(page);+ response.setPage(page);await tool.handler({params,diff --git a/src/tools/ToolDefinition.ts b/src/tools/ToolDefinition.tsindex c6c1f297..982cf9b7 100644--- a/src/tools/ToolDefinition.ts+++ b/src/tools/ToolDefinition.ts@@ -136,10 +136,6 @@ export type Context = Readonly<{isCruxEnabled(): boolean;recordedTraces(): TraceResult[];storeTraceRecording(result: TraceResult): void;- // TODO: Remove once slim tools are converted to pageScoped: true.- getSelectedPage(): Page;- getDialog(page?: Page): Dialog | undefined;- clearDialog(page?: Page): void;getPageById(pageId: number): Page;newPage(background?: boolean,@@ -198,6 +194,9 @@ export type ContextPage = Readonly<{readonly pptrPage: Page;getAXNodeByUid(uid: string): TextSnapshotNode | undefined;getElementByUid(uid: string): Promise<ElementHandle<Element>>;++ getDialog(): Dialog | undefined;+ clearDialog(): void;}>;export function defineTool<Schema extends zod.ZodRawShape>(diff --git a/src/tools/pages.ts b/src/tools/pages.tsindex fa724ee4..9ec27771 100644--- a/src/tools/pages.ts+++ b/src/tools/pages.ts@@ -187,7 +187,7 @@ export const navigatePage = definePageTool({void dialog.dismiss();}// We are not going to report the dialog like regular dialogs.- context.clearDialog(page.pptrPage);+ page.clearDialog();}};@@ -333,9 +333,9 @@ export const handleDialog = definePageTool({.optional().describe('Optional prompt text to enter into the dialog.'),},- handler: async (request, response, context) => {+ handler: async (request, response, _context) => {const page = request.page;- const dialog = context.getDialog(page.pptrPage);+ const dialog = page.getDialog();if (!dialog) {throw new Error('No open dialog found');}@@ -363,7 +363,7 @@ export const handleDialog = definePageTool({}}- context.clearDialog(page.pptrPage);+ page.clearDialog();response.setIncludePages(true);},});diff --git a/src/tools/slim/tools.ts b/src/tools/slim/tools.tsindex 0360eda0..712dcff6 100644--- a/src/tools/slim/tools.ts+++ b/src/tools/slim/tools.ts@@ -7,9 +7,9 @@import type {Dialog} from '../../third_party/index.js';import {zod} from '../../third_party/index.js';import {ToolCategory} from '../categories.js';-import {defineTool} from '../ToolDefinition.js';+import {definePageTool} from '../ToolDefinition.js';-export const screenshot = defineTool({+export const screenshot = definePageTool({name: 'screenshot',description: `Takes a screenshot`,annotations: {@@ -19,8 +19,8 @@ export const screenshot = defineTool({},schema: {},handler: async (request, response, context) => {- const page = context.getSelectedPage();- const screenshot = await page.screenshot({+ const page = request.page;+ const screenshot = await page.pptrPage.screenshot({type: 'png',optimizeForSpeed: true,});@@ -32,7 +32,7 @@ export const screenshot = defineTool({},});-export const navigate = defineTool({+export const navigate = definePageTool({name: 'navigate',description: `Loads a URL`,annotations: {@@ -42,8 +42,9 @@ export const navigate = defineTool({schema: {url: zod.string().describe('URL to navigate to'),},- handler: async (request, response, context) => {- const page = context.getSelectedPage();+ handler: async (request, response) => {+ const page = request.page;+const options = {timeout: 30_000,};@@ -53,22 +54,22 @@ export const navigate = defineTool({response.appendResponseLine(`Accepted a beforeunload dialog.`);void dialog.accept();// We are not going to report the dialog like regular dialogs.- context.clearDialog();+ page.clearDialog();}};- page.on('dialog', dialogHandler);+ page.pptrPage.on('dialog', dialogHandler);try {- await page.goto(request.params.url, options);- response.appendResponseLine(`Navigated to ${page.url()}.`);+ await page.pptrPage.goto(request.params.url, options);+ response.appendResponseLine(`Navigated to ${page.pptrPage.url()}.`);} finally {- page.off('dialog', dialogHandler);+ page.pptrPage.off('dialog', dialogHandler);}},});-export const evaluate = defineTool({+export const evaluate = definePageTool({name: 'evaluate',description: `Evaluates a JavaScript script`,annotations: {@@ -78,10 +79,10 @@ export const evaluate = defineTool({schema: {script: zod.string().describe(`JS script to run on the page`),},- handler: async (request, response, context) => {- const page = context.getSelectedPage();+ handler: async (request, response) => {+ const page = request.page;try {- const result = await page.evaluate(request.params.script);+ const result = await page.pptrPage.evaluate(request.params.script);response.appendResponseLine(JSON.stringify(result));} catch (err) {response.appendResponseLine(String(err.message));diff --git a/tests/McpContext.test.ts b/tests/McpContext.test.tsindex f1499032..387a5bfc 100644--- a/tests/McpContext.test.ts+++ b/tests/McpContext.test.ts@@ -22,7 +22,7 @@ describe('McpContext', () => {it('list pages', async () => {await withMcpContext(async (_response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<button>Click me</button><input@@ -104,7 +104,7 @@ describe('McpContext', () => {it('resolves uid from a non-selected page snapshot', async () => {await withMcpContext(async (_response, context) => {// Page 1: set content and snapshot- const page1 = context.getSelectedPage();+ const page1 = context.getSelectedPptrPage();await page1.setContent(html`<button>Page1 Button</button>`);await context.createTextSnapshot(false, undefined, page1);@@ -230,7 +230,7 @@ describe('McpContext', () => {it('resolves for default context page alongside isolated contexts', async () => {await withMcpContext(async (_response, context) => {// Default context page (already exists from withMcpContext setup).- const defaultPage = context.getSelectedPage();+ const defaultPage = context.getSelectedPptrPage();await defaultPage.setContent(html`<button>Default Button</button>`);await context.createTextSnapshot(false, undefined, defaultPage);const defaultUid = '1_1';diff --git a/tests/McpResponse.test.ts b/tests/McpResponse.test.tsindex dff5a06d..141f4f0b 100644--- a/tests/McpResponse.test.ts+++ b/tests/McpResponse.test.ts@@ -64,7 +64,7 @@ describe('McpResponse', () => {it('does not include anything in response if snapshot is null', async t => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();page.accessibility.snapshot = async () => null;const {content, structuredContent} = await response.handle('test',@@ -80,7 +80,7 @@ describe('McpResponse', () => {it('returns correctly formatted snapshot for a simple tree', async t => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<button>Click me</button><input@@ -104,7 +104,7 @@ describe('McpResponse', () => {it('returns values for textboxes', async t => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<label>username<input@@ -128,7 +128,7 @@ describe('McpResponse', () => {it('returns verbose snapshot and structured content', async t => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<aside>test</aside>`);response.includeSnapshot({verbose: true,@@ -147,7 +147,7 @@ describe('McpResponse', () => {const filePath = join(tmpdir(), 'test-screenshot.png');try {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<aside>test</aside>`);response.includeSnapshot({verbose: true,@@ -178,7 +178,7 @@ describe('McpResponse', () => {it('preserves mapping ids across multiple snapshots', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<div><button id="btn1">Button 1</button>@@ -253,7 +253,7 @@ describe('McpResponse', () => {</div>`,);- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.goto(server.getRoute('/page.html'));response.includeSnapshot();@@ -401,13 +401,13 @@ describe('McpResponse', () => {it('adds a prompt dialog', async t => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedMcpPage();const dialogPromise = new Promise<void>(resolve => {- page.on('dialog', () => {+ page.pptrPage.on('dialog', () => {resolve();});});- page.evaluate(() => {+ page.pptrPage.evaluate(() => {prompt('message', 'default');});await dialogPromise;@@ -415,7 +415,7 @@ describe('McpResponse', () => {'test',context,);- await context.getDialog()?.dismiss();+ await page.getDialog()?.dismiss();t.assert.snapshot?.(getTextContent(content[0]));t.assert.snapshot?.(JSON.stringify(stabilizeStructuredContent(structuredContent), null, 2),@@ -425,13 +425,13 @@ describe('McpResponse', () => {it('adds an alert dialog', async t => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedMcpPage();const dialogPromise = new Promise<void>(resolve => {- page.on('dialog', () => {+ page.pptrPage.on('dialog', () => {resolve();});});- page.evaluate(() => {+ page.pptrPage.evaluate(() => {alert('message');});await dialogPromise;@@ -439,7 +439,7 @@ describe('McpResponse', () => {'test',context,);- await context.getDialog()?.dismiss();+ await page.getDialog()?.dismiss();t.assert.snapshot?.(getTextContent(content[0]));t.assert.snapshot?.(JSON.stringify(stabilizeStructuredContent(structuredContent), null, 2),@@ -544,7 +544,7 @@ describe('McpResponse', () => {it('adds console messages when the setting is true', async t => {await withMcpContext(async (response, context) => {response.setIncludeConsoleData(true);- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();const consoleMessagePromise = new Promise<void>(resolve => {page.on('console', () => {resolve();diff --git a/tests/tools/emulation.test.ts b/tests/tools/emulation.test.tsindex a4754932..6c59dee0 100644--- a/tests/tools/emulation.test.ts+++ b/tests/tools/emulation.test.ts@@ -258,7 +258,7 @@ describe('emulation', () => {it('emulates viewport', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.goto(server.baseUrl + '/viewport');await emulate.handler({@@ -298,7 +298,7 @@ describe('emulation', () => {it('clears viewport override when viewport is set to null', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();// First set a viewportawait emulate.handler({@@ -341,7 +341,7 @@ describe('emulation', () => {assert.strictEqual(context.getViewport(), null);// Somehow reset of the viewport seems to be async.- await context.getSelectedPage().waitForFunction(() => {+ await context.getSelectedPptrPage().waitForFunction(() => {return window.innerWidth !== 400 && window.innerHeight !== 400;});});@@ -370,7 +370,7 @@ describe('emulation', () => {assert.strictEqual(context.getViewport(), null);assert.ok(- await context.getSelectedPage().evaluate(() => {+ await context.getSelectedPptrPage().evaluate(() => {return window.innerWidth !== 400 && window.innerHeight !== 400;}),);@@ -393,7 +393,7 @@ describe('emulation', () => {);assert.strictEqual(context.getUserAgent(), 'MyUA');- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();const ua = await page.evaluate(() => navigator.userAgent);assert.strictEqual(ua, 'MyUA');});@@ -424,7 +424,7 @@ describe('emulation', () => {context,);assert.strictEqual(context.getUserAgent(), 'UA2');- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();const ua = await page.evaluate(() => navigator.userAgent);assert.strictEqual(ua, 'UA2');});@@ -457,7 +457,7 @@ describe('emulation', () => {);assert.strictEqual(context.getUserAgent(), null);- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();const ua = await page.evaluate(() => navigator.userAgent);assert.notStrictEqual(ua, 'MyUA');assert.ok(ua.length > 0);@@ -484,7 +484,7 @@ describe('emulation', () => {assert.strictEqual(context.getUserAgent(), null);assert.ok(- await context.getSelectedPage().evaluate(() => {+ await context.getSelectedPptrPage().evaluate(() => {return navigator.userAgent !== 'MyUA';}),);@@ -507,7 +507,7 @@ describe('emulation', () => {);assert.strictEqual(context.getColorScheme(), 'dark');- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();const scheme = await page.evaluate(() =>window.matchMedia('(prefers-color-scheme: dark)').matches? 'dark'@@ -542,7 +542,7 @@ describe('emulation', () => {context,);assert.strictEqual(context.getColorScheme(), 'light');- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();const scheme = await page.evaluate(() =>window.matchMedia('(prefers-color-scheme: light)').matches? 'light'@@ -554,7 +554,7 @@ describe('emulation', () => {it('resets color scheme when set to auto', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();const initial = await page.evaluate(() => window.matchMedia('(prefers-color-scheme: dark)').matches,diff --git a/tests/tools/extensions.test.ts b/tests/tools/extensions.test.tsindex c8bbce68..2fbf62a0 100644--- a/tests/tools/extensions.test.ts+++ b/tests/tools/extensions.test.ts@@ -48,7 +48,7 @@ describe('extension', () => {);const extensionId = extractId(response);- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.goto('chrome://extensions');const element = await page.waitForSelector(diff --git a/tests/tools/input.test.ts b/tests/tools/input.test.tsindex dee87c6a..19f7efb1 100644--- a/tests/tools/input.test.ts+++ b/tests/tools/input.test.ts@@ -32,7 +32,7 @@ describe('input', () => {describe('click', () => {it('clicks', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<button onclick="this.innerText = 'clicked';">test</button>`,);@@ -57,7 +57,7 @@ describe('input', () => {});it('double clicks', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<button ondblclick="this.innerText = 'dblclicked';">test</button@@ -96,7 +96,7 @@ describe('input', () => {});await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.goto(server.getRoute('/link'));await context.createTextSnapshot();const clickPromise = click.handler(@@ -139,7 +139,7 @@ describe('input', () => {`,);await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.goto(server.getRoute('/unstable'));await context.createTextSnapshot();const handlerResolveTime = await click@@ -165,7 +165,7 @@ describe('input', () => {it('does not include snapshot by default', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<button onclick="this.innerText = 'clicked';">test</button>`,);@@ -190,7 +190,7 @@ describe('input', () => {it('includes snapshot if includeSnapshot is true', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<button onclick="this.innerText = 'clicked';">test</button>`,);@@ -218,7 +218,7 @@ describe('input', () => {describe('hover', () => {it('hovers', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<button onmouseover="this.innerText = 'hovered';">test</button>`,);@@ -246,7 +246,7 @@ describe('input', () => {describe('click_at', () => {it('clicks at coordinates', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<divstyle="width: 100px; height: 100px; background: red;"@@ -276,7 +276,7 @@ describe('input', () => {it('double clicks at coordinates', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<divstyle="width: 100px; height: 100px; background: red;"@@ -309,7 +309,7 @@ describe('input', () => {describe('fill', () => {it('fills out an input', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<input />`);await context.createTextSnapshot();await fill.handler(@@ -334,7 +334,7 @@ describe('input', () => {it('fills out a select by text', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<select><option value="v1">one</option@@ -367,7 +367,7 @@ describe('input', () => {it('fills out a textarea marked as combobox', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<textarea role="combobox"></textarea>`);await context.createTextSnapshot();await fill.handler(@@ -396,7 +396,7 @@ describe('input', () => {it('fills out a textarea with long text', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<textarea></textarea>`);await context.createTextSnapshot();page.setDefaultTimeout(1000);@@ -428,7 +428,7 @@ describe('input', () => {it('types text', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<textarea></textarea>`);await page.click('textarea');await context.createTextSnapshot();@@ -454,7 +454,7 @@ describe('input', () => {it('types text with submit key', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<textarea></textarea>`);await page.click('textarea');await context.createTextSnapshot();@@ -491,7 +491,7 @@ describe('input', () => {it('errors on invalid submit key', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<textarea></textarea>`);await page.click('textarea');await context.createTextSnapshot();@@ -515,7 +515,7 @@ describe('input', () => {it('reproduction: fill isolation', async () => {await withMcpContext(async (_response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<form><input@@ -592,7 +592,7 @@ describe('input', () => {describe('drags', () => {it('drags one element onto another', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<divrole="button"@@ -647,7 +647,7 @@ describe('input', () => {describe('fill form', () => {it('successfully fills out the form', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<form><label@@ -712,7 +712,7 @@ describe('input', () => {await fs.writeFile(testFilePath, 'test file content');await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<form><input@@ -748,7 +748,7 @@ describe('input', () => {await fs.writeFile(testFilePath, 'test file content');await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<button id="file-chooser-button">Upload file</button><input@@ -796,7 +796,7 @@ describe('input', () => {await fs.writeFile(testFilePath, 'test file content');await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<div>Not a file input</div>`);await context.createTextSnapshot();@@ -856,7 +856,7 @@ describe('input', () => {it('processes press_key', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<script>logs = [];diff --git a/tests/tools/lighthouse.test.ts b/tests/tools/lighthouse.test.tsindex 17694dc7..4b7dce77 100644--- a/tests/tools/lighthouse.test.ts+++ b/tests/tools/lighthouse.test.ts@@ -21,7 +21,7 @@ describe('lighthouse', () => {server.addHtmlRoute('/test', html`<div>Test</div>`);await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.goto(server.getRoute('/test'));await lighthouseAudit.handler(@@ -56,7 +56,7 @@ describe('lighthouse', () => {server.addHtmlRoute('/test-mobile', html`<div>Test Mobile</div>`);await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.goto(server.getRoute('/test-mobile'));await context.emulate({viewport: {@@ -121,7 +121,7 @@ describe('lighthouse', () => {server.addHtmlRoute('/test-mobile', html`<div>Test Mobile</div>`);await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.goto(server.getRoute('/test-mobile'));await lighthouseAudit.handler(@@ -156,7 +156,7 @@ describe('lighthouse', () => {try {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.goto(server.getRoute('/test-mobile'));await lighthouseAudit.handler(diff --git a/tests/tools/network.test.ts b/tests/tools/network.test.tsindex 10cf8ec3..14255500 100644--- a/tests/tools/network.test.ts+++ b/tests/tools/network.test.ts@@ -41,7 +41,7 @@ describe('network', () => {await withMcpContext(async (response, context) => {await context.setUpNetworkCollectorForTesting();- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.goto(server.getRoute('/one'));await page.goto(server.getRoute('/two'));await page.goto(server.getRoute('/three'));@@ -68,7 +68,7 @@ describe('network', () => {await withMcpContext(async (response, context) => {await context.setUpNetworkCollectorForTesting();- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.goto(server.getRoute('/one'));await page.goto(server.getRoute('/two'));await page.goto(server.getRoute('/three'));@@ -111,7 +111,7 @@ describe('network', () => {await withMcpContext(async (response, context) => {await context.setUpNetworkCollectorForTesting();- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.goto(server.getRoute('/redirect'), {waitUntil: 'networkidle0',});@@ -135,7 +135,7 @@ describe('network', () => {describe('network_get_request', () => {it('attaches request', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.goto('data:text/html,<div>Hello MCP</div>');await getNetworkRequest.handler({params: {reqid: 1}, page: context.getSelectedMcpPage()},@@ -148,7 +148,7 @@ describe('network', () => {});it('should not add the request list', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.goto('data:text/html,<div>Hello MCP</div>');await getNetworkRequest.handler({params: {reqid: 1}, page: context.getSelectedMcpPage()},@@ -165,7 +165,7 @@ describe('network', () => {await withMcpContext(async (response, context) => {await context.setUpNetworkCollectorForTesting();- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.goto(server.getRoute('/one'));await page.goto(server.getRoute('/two'));await page.goto(server.getRoute('/three'));diff --git a/tests/tools/pages.test.ts b/tests/tools/pages.test.tsindex 6a78eecb..3a4bdcd9 100644--- a/tests/tools/pages.test.ts+++ b/tests/tools/pages.test.ts@@ -105,20 +105,26 @@ describe('pages', () => {describe('new_page', () => {it('create a page', async () => {await withMcpContext(async (response, context) => {- assert.strictEqual(context.getPageById(1), context.getSelectedPage());+ assert.strictEqual(+ context.getPageById(1),+ context.getSelectedPptrPage(),+ );await newPage.handler({params: {url: 'about:blank'}},response,context,);- assert.strictEqual(context.getPageById(2), context.getSelectedPage());+ assert.strictEqual(+ context.getPageById(2),+ context.getSelectedPptrPage(),+ );assert.ok(response.includePages);});});it('create a page in the background', async () => {await withMcpContext(async (response, context) => {const originalPage = context.getPageById(1);- assert.strictEqual(originalPage, context.getSelectedPage());+ assert.strictEqual(originalPage, context.getSelectedPptrPage());// Ensure original page has focusawait originalPage.bringToFront();assert.strictEqual(@@ -131,7 +137,10 @@ describe('pages', () => {context,);// New page should be selected but original should retain focus- assert.strictEqual(context.getPageById(2), context.getSelectedPage());+ assert.strictEqual(+ context.getPageById(2),+ context.getSelectedPptrPage(),+ );assert.strictEqual(await originalPage.evaluate(() => document.hasFocus()),true,@@ -148,7 +157,7 @@ describe('pages', () => {response,context,);- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();assert.strictEqual(context.getIsolatedContextName(page), 'session-a');assert.ok(response.includePages);});@@ -161,13 +170,13 @@ describe('pages', () => {response,context,);- const page1 = context.getSelectedPage();+ const page1 = context.getSelectedPptrPage();await newPage.handler({params: {url: 'about:blank', isolatedContext: 'session-a'}},response,context,);- const page2 = context.getSelectedPage();+ const page2 = context.getSelectedPptrPage();assert.notStrictEqual(page1, page2);assert.strictEqual(context.getIsolatedContextName(page1), 'session-a');assert.strictEqual(context.getIsolatedContextName(page2), 'session-a');@@ -182,13 +191,13 @@ describe('pages', () => {response,context,);- const pageA = context.getSelectedPage();+ const pageA = context.getSelectedPptrPage();await newPage.handler({params: {url: 'about:blank', isolatedContext: 'session-b'}},response,context,);- const pageB = context.getSelectedPage();+ const pageB = context.getSelectedPptrPage();assert.strictEqual(context.getIsolatedContextName(pageA), 'session-a');assert.strictEqual(context.getIsolatedContextName(pageB), 'session-b');assert.notStrictEqual(pageA.browserContext(), pageB.browserContext());@@ -213,7 +222,7 @@ describe('pages', () => {it('does not set isolatedContext for pages in the default context', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();assert.strictEqual(context.getIsolatedContextName(page), undefined);await newPage.handler({params: {url: 'about:blank'}},@@ -221,7 +230,7 @@ describe('pages', () => {context,);assert.strictEqual(- context.getIsolatedContextName(context.getSelectedPage()),+ context.getIsolatedContextName(context.getSelectedPptrPage()),undefined,);});@@ -234,7 +243,7 @@ describe('pages', () => {response,context,);- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();const pageId = context.getPageId(page)!;assert.ok(!page.isClosed());await closePage.handler({params: {pageId}}, response, context);@@ -285,7 +294,7 @@ describe('pages', () => {it('falls back to getSelectedPage when no pageId is provided', async () => {await withMcpContext(async (_response, context) => {- const selectedPage = context.getSelectedPage();+ const selectedPage = context.getSelectedPptrPage();assert.strictEqual(context.resolvePageById(undefined).pptrPage,selectedPage,@@ -315,7 +324,7 @@ describe('pages', () => {// Switch global selection back to the default page.await selectPage.handler({params: {pageId: 1}}, response, context);- assert.notStrictEqual(context.getSelectedPage(), isolatedPage);+ assert.notStrictEqual(context.getSelectedPptrPage(), isolatedPage);// Navigate using page; should target the isolated page.await navigatePage.handler(@@ -337,7 +346,7 @@ describe('pages', () => {// Verify the default page was NOT affected.const defaultContent = await context- .getSelectedPage()+ .getSelectedPptrPage().evaluate(() => document.querySelector('h1')?.textContent);assert.notStrictEqual(defaultContent, 'Navigated');});@@ -348,7 +357,10 @@ describe('pages', () => {it('closes a page', async () => {await withMcpContext(async (response, context) => {const page = await context.newPage();- assert.strictEqual(context.getPageById(2), context.getSelectedPage());+ assert.strictEqual(+ context.getPageById(2),+ context.getSelectedPptrPage(),+ );assert.strictEqual(context.getPageById(2), page.pptrPage);await closePage.handler({params: {pageId: 2}}, response, context);assert.ok(page.pptrPage.isClosed());@@ -357,7 +369,7 @@ describe('pages', () => {});it('cannot close the last page', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await closePage.handler({params: {pageId: 1}}, response, context);assert.deepStrictEqual(response.responseLines[0],@@ -372,22 +384,34 @@ describe('pages', () => {it('selects a page', async () => {await withMcpContext(async (response, context) => {await context.newPage();- assert.strictEqual(context.getPageById(2), context.getSelectedPage());+ assert.strictEqual(+ context.getPageById(2),+ context.getSelectedPptrPage(),+ );await selectPage.handler({params: {pageId: 1}}, response, context);- assert.strictEqual(context.getPageById(1), context.getSelectedPage());+ assert.strictEqual(+ context.getPageById(1),+ context.getSelectedPptrPage(),+ );assert.ok(response.includePages);});});it('selects a page and keeps it focused in the background', async () => {await withMcpContext(async (response, context) => {await context.newPage();- assert.strictEqual(context.getPageById(2), context.getSelectedPage());+ assert.strictEqual(+ context.getPageById(2),+ context.getSelectedPptrPage(),+ );assert.strictEqual(await context.getPageById(1).evaluate(() => document.hasFocus()),false,);await selectPage.handler({params: {pageId: 1}}, response, context);- assert.strictEqual(context.getPageById(1), context.getSelectedPage());+ assert.strictEqual(+ context.getPageById(1),+ context.getSelectedPptrPage(),+ );assert.strictEqual(await context.getPageById(1).evaluate(() => document.hasFocus()),true,@@ -403,7 +427,7 @@ describe('pages', () => {response,context,);- const pageA = context.getSelectedPage();+ const pageA = context.getSelectedPptrPage();const pageAId = context.getPageId(pageA)!;await newPage.handler(@@ -411,7 +435,7 @@ describe('pages', () => {response,context,);- const pageB = context.getSelectedPage();+ const pageB = context.getSelectedPptrPage();// Selecting pageB (ctx-b) should not defocus pageA (ctx-a).assert.strictEqual(@@ -447,7 +471,7 @@ describe('pages', () => {response,context,);- const pageA1 = context.getSelectedPage();+ const pageA1 = context.getSelectedPptrPage();const pageA1Id = context.getPageId(pageA1)!;await newPage.handler(@@ -455,7 +479,7 @@ describe('pages', () => {response,context,);- const pageB = context.getSelectedPage();+ const pageB = context.getSelectedPptrPage();// pageA1 still focused (cross-context select doesn't defocus it).assert.strictEqual(@@ -470,7 +494,7 @@ describe('pages', () => {response,context,);- const pageA2 = context.getSelectedPage();+ const pageA2 = context.getSelectedPptrPage();// pageA1 and pageA2 share the same BrowserContext.assert.strictEqual(pageA1.browserContext(), pageA2.browserContext());@@ -514,14 +538,14 @@ describe('pages', () => {response,context,);- const pageA1 = context.getSelectedPage();+ const pageA1 = context.getSelectedPptrPage();await newPage.handler({params: {url: 'about:blank', isolatedContext: 'ctx-a'}},response,context,);- const pageA2 = context.getSelectedPage();+ const pageA2 = context.getSelectedPptrPage();const pageA2Id = context.getPageId(pageA2)!;// pageA2 is focused, pageA1 is not.@@ -566,7 +590,7 @@ describe('pages', () => {response,context,);- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();assert.equal(await page.evaluate(() => document.querySelector('div')?.textContent),'Hello MCP',@@ -578,7 +602,10 @@ describe('pages', () => {it('throws an error if the page was closed not by the MCP server', async () => {await withMcpContext(async (response, context) => {const page = await context.newPage();- assert.strictEqual(context.getPageById(2), context.getSelectedPage());+ assert.strictEqual(+ context.getPageById(2),+ context.getSelectedPptrPage(),+ );assert.strictEqual(context.getPageById(2), page.pptrPage);await page.pptrPage.close();@@ -604,7 +631,7 @@ describe('pages', () => {it('respects the timeout parameter', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();const stub = sinon.stub(page, 'waitForNavigation').resolves(null);try {@@ -632,7 +659,7 @@ describe('pages', () => {});it('go back', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.goto('data:text/html,<div>Hello MCP</div>');await navigatePage.handler({params: {type: 'back'}, page: context.getSelectedMcpPage()},@@ -649,7 +676,7 @@ describe('pages', () => {});it('go forward', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.goto('data:text/html,<div>Hello MCP</div>');await page.goBack();await navigatePage.handler(@@ -667,7 +694,7 @@ describe('pages', () => {});it('reload', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.goto('data:text/html,<div>Hello MCP</div>');await navigatePage.handler({params: {type: 'reload'}, page: context.getSelectedMcpPage()},@@ -685,7 +712,7 @@ describe('pages', () => {it('reload with accpeting the beforeunload dialog', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html` <script>window.addEventListener('beforeunload', e => {@@ -701,7 +728,7 @@ describe('pages', () => {context,);- assert.strictEqual(context.getDialog(), undefined);+ assert.strictEqual(context.getSelectedMcpPage().getDialog(), undefined);assert.ok(response.includePages);assert.strictEqual(response.responseLines.join('\n'),@@ -712,7 +739,7 @@ describe('pages', () => {it('reload with declining the beforeunload dialog', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html` <script>window.addEventListener('beforeunload', e => {@@ -735,7 +762,7 @@ describe('pages', () => {context,);- assert.strictEqual(context.getDialog(), undefined);+ assert.strictEqual(context.getSelectedMcpPage().getDialog(), undefined);assert.ok(response.includePages);assert.strictEqual(response.responseLines.join('\n'),@@ -789,7 +816,7 @@ describe('pages', () => {response,context,);- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();// wait for up to 1s for the global variable to set by the initScript to existawait page.waitForFunction("window.initScript==='completed'", {@@ -803,7 +830,7 @@ describe('pages', () => {describe('resize', () => {it('resize the page', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();const resizePromise = page.evaluate(() => {return new Promise(resolve => {window.addEventListener('resize', resolve, {once: true});@@ -830,7 +857,7 @@ describe('pages', () => {it('resize when window state is normal', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();const browser = page.browser();const windowId = await page.windowId();await browser.setWindowBounds(windowId, {windowState: 'normal'});@@ -864,7 +891,7 @@ describe('pages', () => {it('resize when window state is minimized', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();const browser = page.browser();const windowId = await page.windowId();await browser.setWindowBounds(windowId, {windowState: 'minimized'});@@ -898,7 +925,7 @@ describe('pages', () => {it('resize when window state is maximized', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();const browser = page.browser();const windowId = await page.windowId();await browser.setWindowBounds(windowId, {windowState: 'maximized'});@@ -932,7 +959,7 @@ describe('pages', () => {it('resize when window state is fullscreen', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();const browser = page.browser();const windowId = await page.windowId();await browser.setWindowBounds(windowId, {windowState: 'fullscreen'});@@ -968,7 +995,7 @@ describe('pages', () => {describe('dialogs', () => {it('can accept dialogs', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();const dialogPromise = new Promise<void>(resolve => {page.on('dialog', () => {resolve();@@ -988,7 +1015,7 @@ describe('pages', () => {response,context,);- assert.strictEqual(context.getDialog(), undefined);+ assert.strictEqual(context.getSelectedMcpPage().getDialog(), undefined);assert.strictEqual(response.responseLines[0],'Successfully accepted the dialog',@@ -997,7 +1024,7 @@ describe('pages', () => {});it('can dismiss dialogs', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();const dialogPromise = new Promise<void>(resolve => {page.on('dialog', () => {resolve();@@ -1017,7 +1044,7 @@ describe('pages', () => {response,context,);- assert.strictEqual(context.getDialog(), undefined);+ assert.strictEqual(context.getSelectedMcpPage().getDialog(), undefined);assert.strictEqual(response.responseLines[0],'Successfully dismissed the dialog',@@ -1026,7 +1053,7 @@ describe('pages', () => {});it('can dismiss already dismissed dialog dialogs', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();const dialogPromise = new Promise<Dialog>(resolve => {page.on('dialog', dialog => {resolve(dialog);@@ -1047,7 +1074,7 @@ describe('pages', () => {response,context,);- assert.strictEqual(context.getDialog(), undefined);+ assert.strictEqual(context.getSelectedMcpPage().getDialog(), undefined);assert.strictEqual(response.responseLines[0],'Successfully dismissed the dialog',@@ -1080,7 +1107,7 @@ describe('pages', () => {response,context,);- assert.strictEqual(context.getDialog(page1.pptrPage), undefined);+ assert.strictEqual(page1.getDialog(), undefined);assert.strictEqual(response.responseLines[0],'Successfully accepted the dialog',@@ -1116,8 +1143,8 @@ describe('pages', () => {await dialog2Promise;// Both dialogs should be tracked.- assert.ok(context.getDialog(page1.pptrPage));- assert.ok(context.getDialog(page2.pptrPage));+ assert.ok(page1.getDialog());+ assert.ok(page2.getDialog());// Handle page1's dialog; page2's should remain.await handleDialog.handler(@@ -1125,8 +1152,8 @@ describe('pages', () => {response,context,);- assert.strictEqual(context.getDialog(page1.pptrPage), undefined);- assert.ok(context.getDialog(page2.pptrPage));+ assert.strictEqual(page1.getDialog(), undefined);+ assert.ok(page2.getDialog());// Handle page2's dialog.await handleDialog.handler(@@ -1134,7 +1161,7 @@ describe('pages', () => {response,context,);- assert.strictEqual(context.getDialog(page2.pptrPage), undefined);+ assert.strictEqual(page2.getDialog(), undefined);});});});@@ -1142,7 +1169,7 @@ describe('pages', () => {describe('get_tab_id', () => {it('returns the tab id', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();// @ts-expect-error _tabId is internal.assert.ok(typeof page._tabId === 'string');// @ts-expect-error _tabId is internal.diff --git a/tests/tools/performance.test.ts b/tests/tools/performance.test.tsindex 16a579c2..229f1da2 100644--- a/tests/tools/performance.test.ts+++ b/tests/tools/performance.test.ts@@ -46,7 +46,7 @@ describe('performance', () => {it('starts a trace recording', async () => {await withMcpContext(async (response, context) => {context.setIsRunningPerformanceTrace(false);- const selectedPage = context.getSelectedPage();+ const selectedPage = context.getSelectedPptrPage();const startTracingStub = sinon.stub(selectedPage.tracing, 'start');await startTrace.handler({@@ -68,7 +68,7 @@ describe('performance', () => {it('can navigate to about:blank and record a page reload', async () => {await withMcpContext(async (response, context) => {- const selectedPage = context.getSelectedPage();+ const selectedPage = context.getSelectedPptrPage();sinon.stub(selectedPage, 'url').callsFake(() => 'https://www.test.com');const gotoStub = sinon.stub(selectedPage, 'goto');const startTracingStub = sinon.stub(selectedPage.tracing, 'start');@@ -100,7 +100,7 @@ describe('performance', () => {const rawData = loadTraceAsBuffer('basic-trace.json.gz');await withMcpContext(async (response, context) => {- const selectedPage = context.getSelectedPage();+ const selectedPage = context.getSelectedPptrPage();sinon.stub(selectedPage, 'url').callsFake(() => 'https://www.test.com');sinon.stub(selectedPage, 'goto').callsFake(() => Promise.resolve(null));const startTracingStub = sinon.stub(selectedPage.tracing, 'start');@@ -147,7 +147,7 @@ describe('performance', () => {it('errors if a recording is already active', async () => {await withMcpContext(async (response, context) => {context.setIsRunningPerformanceTrace(true);- const selectedPage = context.getSelectedPage();+ const selectedPage = context.getSelectedPptrPage();const startTracingStub = sinon.stub(selectedPage.tracing, 'start');await startTrace.handler({@@ -174,7 +174,7 @@ describe('performance', () => {await withMcpContext(async (response, context) => {const filePath = 'test-trace.json.gz';- const selectedPage = context.getSelectedPage();+ const selectedPage = context.getSelectedPptrPage();sinon.stub(selectedPage, 'url').callsFake(() => 'https://www.test.com');sinon.stub(selectedPage, 'goto').callsFake(() => Promise.resolve(null));sinon.stub(selectedPage.tracing, 'start');@@ -273,7 +273,7 @@ describe('performance', () => {it('does nothing if the trace is not running and does not error', async () => {await withMcpContext(async (response, context) => {context.setIsRunningPerformanceTrace(false);- const selectedPage = context.getSelectedPage();+ const selectedPage = context.getSelectedPptrPage();const stopTracingStub = sinon.stub(selectedPage.tracing, 'stop');await stopTrace.handler({params: {}, page: context.getSelectedMcpPage()},@@ -289,7 +289,7 @@ describe('performance', () => {const rawData = loadTraceAsBuffer('basic-trace.json.gz');await withMcpContext(async (response, context) => {context.setIsRunningPerformanceTrace(true);- const selectedPage = context.getSelectedPage();+ const selectedPage = context.getSelectedPptrPage();const stopTracingStub = sinon.stub(selectedPage.tracing, 'stop').callsFake(async () => {@@ -313,7 +313,7 @@ describe('performance', () => {it('throws an error if parsing the trace buffer fails', async () => {await withMcpContext(async (response, context) => {context.setIsRunningPerformanceTrace(true);- const selectedPage = context.getSelectedPage();+ const selectedPage = context.getSelectedPptrPage();sinon.stub(selectedPage.tracing, 'stop').returns(Promise.resolve(undefined));@@ -334,7 +334,7 @@ describe('performance', () => {await withMcpContext(async (response, context) => {const filePath = 'test-trace.json';context.setIsRunningPerformanceTrace(true);- const selectedPage = context.getSelectedPage();+ const selectedPage = context.getSelectedPptrPage();const stopTracingStub = sinon.stub(selectedPage.tracing, 'stop').resolves(rawData);@@ -364,7 +364,7 @@ describe('performance', () => {await withMcpContext(async (response, context) => {context.setIsRunningPerformanceTrace(true);- const selectedPage = context.getSelectedPage();+ const selectedPage = context.getSelectedPptrPage();sinon.stub(selectedPage.tracing, 'stop').resolves(rawData);await stopTrace.handler(diff --git a/tests/tools/screencast.test.ts b/tests/tools/screencast.test.tsindex f6ef1b57..b6e7fd95 100644--- a/tests/tools/screencast.test.ts+++ b/tests/tools/screencast.test.ts@@ -27,7 +27,7 @@ describe('screencast', () => {it('starts a screencast recording with filePath', async () => {await withMcpContext(async (response, context) => {const mockRecorder = createMockRecorder();- const selectedPage = context.getSelectedPage();+ const selectedPage = context.getSelectedPptrPage();const screencastStub = sinon.stub(selectedPage, 'screencast').resolves(mockRecorder as never);@@ -58,7 +58,7 @@ describe('screencast', () => {it('starts a screencast recording with temp file when no filePath', async () => {await withMcpContext(async (response, context) => {const mockRecorder = createMockRecorder();- const selectedPage = context.getSelectedPage();+ const selectedPage = context.getSelectedPptrPage();const screencastStub = sinon.stub(selectedPage, 'screencast').resolves(mockRecorder as never);@@ -85,7 +85,7 @@ describe('screencast', () => {filePath: '/tmp/existing.mp4',});- const selectedPage = context.getSelectedPage();+ const selectedPage = context.getSelectedPptrPage();const screencastStub = sinon.stub(selectedPage, 'screencast');await startScreencast.handler(@@ -105,7 +105,7 @@ describe('screencast', () => {it('provides a clear error when ffmpeg is not found', async () => {await withMcpContext(async (response, context) => {- const selectedPage = context.getSelectedPage();+ const selectedPage = context.getSelectedPptrPage();const error = new Error('spawn ffmpeg ENOENT');sinon.stub(selectedPage, 'screencast').rejects(error);diff --git a/tests/tools/screenshot.test.ts b/tests/tools/screenshot.test.tsindex cdb30882..49830a96 100644--- a/tests/tools/screenshot.test.ts+++ b/tests/tools/screenshot.test.ts@@ -19,7 +19,7 @@ describe('screenshot', () => {it('with default options', async () => {await withMcpContext(async (response, context) => {const fixture = screenshots.basic;- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(fixture.html);await screenshot.handler({params: {format: 'png'}, page: context.getSelectedMcpPage()},@@ -38,7 +38,7 @@ describe('screenshot', () => {it('ignores quality', async () => {await withMcpContext(async (response, context) => {const fixture = screenshots.basic;- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(fixture.html);await screenshot.handler({@@ -92,7 +92,7 @@ describe('screenshot', () => {it('with full page', async () => {await withMcpContext(async (response, context) => {const fixture = screenshots.viewportOverflow;- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(fixture.html);await screenshot.handler({@@ -114,7 +114,7 @@ describe('screenshot', () => {it('with full page resulting in a large screenshot', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`${`<div style="color:blue;">test</div>`.repeat(6500)}@@ -153,7 +153,7 @@ describe('screenshot', () => {await withMcpContext(async (response, context) => {const fixture = screenshots.button;- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(fixture.html);await context.createTextSnapshot();await screenshot.handler(@@ -182,7 +182,7 @@ describe('screenshot', () => {const filePath = join(tmpdir(), 'test-screenshot.png');try {const fixture = screenshots.basic;- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(fixture.html);await screenshot.handler({@@ -225,7 +225,7 @@ describe('screenshot', () => {try {await withMcpContext(async (response, context) => {const fixture = screenshots.basic;- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(fixture.html);await assert.rejects(screenshot.handler(@@ -252,7 +252,7 @@ describe('screenshot', () => {try {await withMcpContext(async (response, context) => {const fixture = screenshots.basic;- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(fixture.html);await assert.rejects(screenshot.handler(@@ -280,7 +280,7 @@ describe('screenshot', () => {const invalidChar = process.platform === 'win32' ? '>' : '\0';const filePath = `malformed${invalidChar}path.png`;const fixture = screenshots.basic;- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(fixture.html);await assert.rejects(screenshot.handler(diff --git a/tests/tools/script.test.ts b/tests/tools/script.test.tsindex 0dcd8a93..c0203d71 100644--- a/tests/tools/script.test.ts+++ b/tests/tools/script.test.ts@@ -67,7 +67,7 @@ describe('script', () => {it('work for complex objects', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<script src="./scripts.js"></script> `);@@ -96,7 +96,7 @@ describe('script', () => {it('work for async functions', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<script src="./scripts.js"></script> `);@@ -120,7 +120,7 @@ describe('script', () => {it('work with one argument', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<button id="test">test</button>`);@@ -146,7 +146,7 @@ describe('script', () => {it('work with multiple args', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<button id="test">test</button>`);@@ -178,7 +178,7 @@ describe('script', () => {server.addHtmlRoute('/main', html`<iframe src="/iframe"></iframe>`);await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.goto(server.getRoute('/main'));await context.createTextSnapshot();await evaluateScript.handler(diff --git a/tests/tools/slim/tools.test.ts b/tests/tools/slim/tools.test.tsindex aef441d3..f17adc95 100644--- a/tests/tools/slim/tools.test.ts+++ b/tests/tools/slim/tools.test.ts@@ -21,6 +21,7 @@ describe('slim', () => {params: {script: `2 * 5`,},+ page: context.getSelectedMcpPage(),},response,context,@@ -36,6 +37,7 @@ describe('slim', () => {params: {script: `throw new Error('test error')`,},+ page: context.getSelectedMcpPage(),},response,context,@@ -47,11 +49,14 @@ describe('slim', () => {it('navigates to correct page', async t => {await withMcpContext(async (response, context) => {await navigate.handler(- {params: {url: 'data:text/html,<div>Hello MCP</div>'}},+ {+ params: {url: 'data:text/html,<div>Hello MCP</div>'},+ page: context.getSelectedMcpPage(),+ },response,context,);- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();assert.equal(await page.evaluate(() => document.querySelector('div')?.textContent),'Hello MCP',@@ -64,9 +69,13 @@ describe('slim', () => {it('with default options', async () => {await withMcpContext(async (response, context) => {const fixture = screenshots.basic;- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(fixture.html);- await screenshot.handler({params: {format: 'png'}}, response, context);+ await screenshot.handler(+ {params: {format: 'png'}, page: context.getSelectedMcpPage()},+ response,+ context,+ );assert(path.isAbsolute(response.responseLines.at(0)!));assert(fs.existsSync(response.responseLines.at(0)!));});diff --git a/tests/tools/snapshot.test.ts b/tests/tools/snapshot.test.tsindex c046ee3a..b64c1cd2 100644--- a/tests/tools/snapshot.test.ts+++ b/tests/tools/snapshot.test.ts@@ -26,7 +26,7 @@ describe('snapshot', () => {describe('browser_wait_for', () => {it('should work', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<main><span>Hello</span><span> </span><div>World</div></main>`,@@ -52,7 +52,7 @@ describe('snapshot', () => {it('should work with any-match array', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<main><span>Status</span><div>Error</div></main>`,@@ -78,7 +78,7 @@ describe('snapshot', () => {it('should work with any-match array when element shows up later', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();const handlePromise = waitFor.handler({@@ -109,7 +109,7 @@ describe('snapshot', () => {it('should work with element that show up later', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();const handlePromise = waitFor.handler({@@ -137,7 +137,7 @@ describe('snapshot', () => {});it('should work with aria elements', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<main><h1>Header</h1><div>Text</div></main>`,@@ -164,7 +164,7 @@ describe('snapshot', () => {it('should work with iframe content', async () => {await withMcpContext(async (response, context) => {- const page = context.getSelectedPage();+ const page = context.getSelectedPptrPage();await page.setContent(html`<h1>Top level</h1>diff --git a/tests/utils.ts b/tests/utils.tsindex d1967981..d26dc309 100644--- a/tests/utils.ts+++ b/tests/utils.ts@@ -103,6 +103,8 @@ export async function withMcpContext(Locator,);+ response.setPage(context.getSelectedMcpPage());+await cb(response, context);}, options);}