Chrome DevTools for coding agents
refactor: unify call type and ensure typesafety (#2659)
Nikolay Vitkov882f93e9a880
diff --git a/scripts/generate-docs.ts b/scripts/generate-docs.tsindex 041a3ee5..e7d81acd 100644--- a/scripts/generate-docs.ts+++ b/scripts/generate-docs.ts@@ -18,7 +18,6 @@ import {categoryToFlagName,} from '../build/src/config/category-options.js';import {ToolCategory, labels} from '../build/src/tools/categories.js';-import {pageIdSchema} from '../build/src/tools/ToolDefinition.js';import {createTools} from '../build/src/tools/tools.js';const OUTPUT_PATH = './docs/tool-reference.md';@@ -414,7 +413,7 @@ async function generateReference(}// eslint-disable-next-line @typescript-eslint/no-explicit-any-function getToolsAndCategories(tools: any, slim = false) {+function getToolsAndCategories(tools: any) {// Convert ToolDefinitions to ToolWithAnnotationsconst toolsWithAnnotations: ToolWithAnnotations[] = tools.filter(tool => {@@ -435,12 +434,8 @@ function getToolsAndCategories(tools: any, slim = false) {const properties: Record<string, TypeInfo> = {};const required: string[] = [];- const toolSchema = {- ...tool.schema,- ...(tool.pageScoped && !slim ? pageIdSchema : {}),- };for (const [key, schema] of Object.entries(- toolSchema as unknown as Record<string, ZodSchema>,+ tool.schema as unknown as Record<string, ZodSchema>,)) {const info = getZodTypeInfo(schema);properties[key] = info;@@ -518,10 +513,7 @@ async function generateToolDocumentation(): Promise<void> {{const {toolsWithAnnotations, categories, sortedCategories} =- getToolsAndCategories(- createTools({slim: true} as ParsedArguments),- true,- );+ getToolsAndCategories(createTools({slim: true} as ParsedArguments));await generateReference('Chrome DevTools MCP Slim Tool Reference',SLIM_OUTPUT_PATH,diff --git a/src/McpContext.ts b/src/McpContext.tsindex 0a912e98..b2759d3a 100644--- a/src/McpContext.ts+++ b/src/McpContext.ts@@ -39,7 +39,6 @@ import {type Root,type DevTools,} from './third_party/index.js';-import {listPages} from './tools/pages.js';import {CLOSE_PAGE_ERROR} from './tools/ToolDefinition.js';import type {Context,@@ -422,7 +421,7 @@ export class McpContext implements Context {}if (page.pptrPage.isClosed()) {throw new Error(- `The selected page has been closed. Call ${listPages().name} to see open pages.`,+ 'The selected page has been closed. Call list_pages to see open pages.',);}return page;diff --git a/src/McpPage.ts b/src/McpPage.tsindex 3d20fc84..b2c1a422 100644--- a/src/McpPage.ts+++ b/src/McpPage.ts@@ -81,7 +81,6 @@ import {DevTools,type JSONSchema7Definition,} from './third_party/index.js';-import {takeSnapshot} from './tools/snapshot.js';import type {ToolGroups} from './tools/thirdPartyDeveloper.js';const DEFAULT_TIMEOUT = 5_000;const NAVIGATION_TIMEOUT = 10_000;@@ -686,7 +685,7 @@ export class McpPage implements ContextPage {async getElementByUid(uid: string): Promise<ElementHandle<Element>> {if (!this.textSnapshot) {throw new Error(- `No snapshot found for page ${this.id ?? '?'}. Use ${takeSnapshot.name} to capture one.`,+ `No snapshot found for page ${this.id ?? '?'}. Use take_snapshot to capture one.`,);}const node = this.textSnapshot.idToNode.get(uid);@@ -758,7 +757,7 @@ export class McpPage implements ContextPage {async getMatchedStylesForUid(uid: string): Promise<MatchedStyles> {if (!this.textSnapshot) {throw new Error(- `No snapshot found for page ${this.id ?? '?'}. Use ${takeSnapshot.name} to capture one.`,+ `No snapshot found for page ${this.id ?? '?'}. Use take_snapshot to capture one.`,);}const node = this.textSnapshot.idToNode.get(uid);@@ -799,7 +798,7 @@ export class McpPage implements ContextPage {if (!domNode || !cssModel) {throw new Error(- `Element with uid "${uid}" was detached or no longer exists on the page. Please take a new snapshot with ${takeSnapshot.name}.`,+ `Element with uid "${uid}" was detached or no longer exists on the page. Please take a new snapshot with take_snapshot.`,);}diff --git a/src/McpResponse.ts b/src/McpResponse.tsindex 63e5cc98..cc23b4aa 100644--- a/src/McpResponse.ts+++ b/src/McpResponse.ts@@ -896,7 +896,7 @@ export class McpResponse implements Response {if (this.#reconnectNotice) {structuredContent.reconnected = true;response.push(- `Note: the browser was restarted or reconnected since the last call. Page ids have changed. Call ${listPages().name} to see open pages.`,+ `Note: the browser was restarted or reconnected since the last call. Page ids have changed. Call ${listPages(this.#args).name} to see open pages.`,);}if (this.#textResponseLines.length) {@@ -963,7 +963,7 @@ export class McpResponse implements Response {: '';response.push(`# Open dialog${dialog.type()}: ${dialog.message()}${defaultValueIfNeeded}.-Call ${handleDialog.name} to handle it before continuing.`);+Call ${handleDialog(this.#args).name} to handle it before continuing.`);structuredContent.dialog = {type: dialog.type(),message: dialog.message(),diff --git a/src/ToolHandler.ts b/src/ToolHandler.tsindex 12313009..c6e203c8 100644--- a/src/ToolHandler.ts+++ b/src/ToolHandler.ts@@ -21,7 +21,6 @@ import type {FileVerificationOption,ToolDefinition,} from './tools/ToolDefinition.js';-import {pageIdSchema} from './tools/ToolDefinition.js';import {logger} from './utils/logger.js';import type {Mutex} from './third_party/index.js';import {fileURLToPath, pathToFileURL} from 'node:url';@@ -180,13 +179,7 @@ export class ToolHandler {this.disabledReason = reason;this.shouldRegister = !(disabled && !serverArgs.viaCli);- this.inputSchema =- 'pageScoped' in tool &&- tool.pageScoped &&- serverArgs.pageIdRouting &&- !serverArgs.slim- ? {...pageIdSchema, ...tool.schema}- : tool.schema;+ this.inputSchema = tool.schema;this.registeredInputSchema = zod.object(this.inputSchema).passthrough();}diff --git a/src/telemetry/metricsRegistry.ts b/src/telemetry/metricsRegistry.tsindex 22b6f8fa..8fb5b54d 100644--- a/src/telemetry/metricsRegistry.ts+++ b/src/telemetry/metricsRegistry.ts@@ -76,6 +76,8 @@ export function applyToExisting<const toAdd = {...entry};if (!updatedNames.has(entry.name)) {toAdd.isDeprecated = true;+ } else {+ delete toAdd.isDeprecated;}result.push(toAdd);}diff --git a/src/telemetry/tool_call_metrics.json b/src/telemetry/tool_call_metrics.jsonindex 505de3c6..ba6f7068 100644--- a/src/telemetry/tool_call_metrics.json+++ b/src/telemetry/tool_call_metrics.json@@ -9,6 +9,10 @@{"name": "include_snapshot","argType": "boolean"+ },+ {+ "name": "page_id",+ "argType": "number"}]},@@ -30,6 +34,10 @@{"name": "include_snapshot","argType": "boolean"+ },+ {+ "name": "page_id",+ "argType": "number"}]},@@ -56,6 +64,10 @@{"name": "include_snapshot","argType": "boolean"+ },+ {+ "name": "page_id",+ "argType": "number"}]},@@ -89,6 +101,10 @@{"name": "extra_http_headers_length","argType": "number"+ },+ {+ "name": "page_id",+ "argType": "number"}]},@@ -154,6 +170,10 @@{"name": "include_snapshot","argType": "boolean"+ },+ {+ "name": "page_id",+ "argType": "number"}]},@@ -167,12 +187,21 @@{"name": "include_snapshot","argType": "boolean"+ },+ {+ "name": "page_id",+ "argType": "number"}]},{"name": "get_console_message",- "args": []+ "args": [+ {+ "name": "page_id",+ "argType": "number"+ }+ ]},{"name": "get_network_request",@@ -184,6 +213,10 @@{"name": "response_file_path_length","argType": "number"+ },+ {+ "name": "page_id",+ "argType": "number"}]},@@ -192,8 +225,7 @@"args": [{"name": "page_id",- "argType": "number",- "isDeprecated": true+ "argType": "number"}]},@@ -207,6 +239,10 @@{"name": "prompt_text_length","argType": "number"+ },+ {+ "name": "page_id",+ "argType": "number"}]},@@ -216,6 +252,10 @@{"name": "include_snapshot","argType": "boolean"+ },+ {+ "name": "page_id",+ "argType": "number"}]},@@ -242,6 +282,10 @@{"name": "output_dir_path_length","argType": "number"+ },+ {+ "name": "page_id",+ "argType": "number"}]},@@ -271,6 +315,10 @@{"name": "include_stack_traces","argType": "boolean"+ },+ {+ "name": "page_id",+ "argType": "number"}]},@@ -301,6 +349,10 @@{"name": "include_preserved_requests","argType": "boolean"+ },+ {+ "name": "page_id",+ "argType": "number"}]},@@ -343,6 +395,10 @@{"name": "timeout","argType": "number"+ },+ {+ "name": "page_id",+ "argType": "number"}]},@@ -377,6 +433,10 @@{"name": "insight_name_length","argType": "number"+ },+ {+ "name": "page_id",+ "argType": "number"}]},@@ -394,6 +454,10 @@{"name": "file_path_length","argType": "number"+ },+ {+ "name": "page_id",+ "argType": "number"}]},@@ -403,6 +467,10 @@{"name": "file_path_length","argType": "number"+ },+ {+ "name": "page_id",+ "argType": "number"}]},@@ -416,6 +484,10 @@{"name": "include_snapshot","argType": "boolean"+ },+ {+ "name": "page_id",+ "argType": "number"}]},@@ -438,6 +510,10 @@{"name": "height","argType": "number"+ },+ {+ "name": "page_id",+ "argType": "number"}]},@@ -452,12 +528,21 @@{"name": "file_path_length","argType": "number"+ },+ {+ "name": "page_id",+ "argType": "number"}]},{"name": "screencast_stop",- "args": []+ "args": [+ {+ "name": "page_id",+ "argType": "number"+ }+ ]},{"name": "screenshot",@@ -504,6 +589,10 @@{"name": "file_path_length","argType": "number"+ },+ {+ "name": "page_id",+ "argType": "number"}]},@@ -517,6 +606,10 @@{"name": "file_path_length","argType": "number"+ },+ {+ "name": "page_id",+ "argType": "number"}]},@@ -539,6 +632,10 @@{"name": "submit_key_length","argType": "number"+ },+ {+ "name": "page_id",+ "argType": "number"}]},@@ -566,6 +663,10 @@{"name": "file_paths_count","argType": "number"+ },+ {+ "name": "page_id",+ "argType": "number"}]},@@ -579,12 +680,21 @@{"name": "timeout","argType": "number"+ },+ {+ "name": "page_id",+ "argType": "number"}]},{"name": "list_webmcp_tools",- "args": []+ "args": [+ {+ "name": "page_id",+ "argType": "number"+ }+ ]},{"name": "execute_webmcp_tool",@@ -596,6 +706,10 @@{"name": "input_length","argType": "number"+ },+ {+ "name": "page_id",+ "argType": "number"}]},@@ -655,12 +769,21 @@{"name": "params_length","argType": "number"+ },+ {+ "name": "page_id",+ "argType": "number"}]},{"name": "list3p_developer_tools",- "args": []+ "args": [+ {+ "name": "page_id",+ "argType": "number"+ }+ ]},{"name": "get_node_retainers",@@ -774,6 +897,10 @@{"name": "file_path_length","argType": "number"+ },+ {+ "name": "page_id",+ "argType": "number"}]},@@ -1064,6 +1191,10 @@{"name": "page_idx","argType": "number"+ },+ {+ "name": "page_id",+ "argType": "number"}]}diff --git a/src/tools/ToolDefinition.ts b/src/tools/ToolDefinition.tsindex cb009579..09a0c656 100644--- a/src/tools/ToolDefinition.ts+++ b/src/tools/ToolDefinition.ts@@ -54,6 +54,18 @@ export type FileVerificationOption =remote?: boolean;};+type AllKeys<T> = T extends unknown ? keyof T : never;++export type MergeSchema<Schema extends zod.ZodRawShape> = {+ [K in AllKeys<Schema>]: Schema extends unknown+ ? K extends keyof Schema+ ? undefined extends Schema[K]+ ? Exclude<Schema[K], undefined> | zod.ZodUndefined+ : Schema[K]+ : zod.ZodUndefined+ : never;+};+export interface BaseToolDefinition<Schema extends zod.ZodRawShape = zod.ZodRawShape,> {@@ -70,22 +82,24 @@ export interface BaseToolDefinition<};schema: Schema;blockedByDialog: boolean;- verifyFilesSchema: Partial<Record<keyof Schema, FileVerificationOption>>;+ verifyFilesSchema: Partial<+ Record<keyof MergeSchema<Schema>, FileVerificationOption>+ >;}export interface ToolDefinition<Schema extends zod.ZodRawShape = zod.ZodRawShape,> extends BaseToolDefinition<Schema> {schema: Schema;- handler: (+ handler(request: Request<Schema>,response: Response,context: Context,- ) => Promise<void>;+ ): Promise<void>;}export interface Request<Schema extends zod.ZodRawShape> {- params: zod.objectOutputType<Schema, zod.ZodTypeAny>;+ params: zod.objectOutputType<MergeSchema<Schema>, zod.ZodTypeAny>;}export interface ImageContentData {@@ -387,84 +401,46 @@ export type ContextPage = Readonly<{}>;export function defineTool<Schema extends zod.ZodRawShape>(- definition: ToolDefinition<Schema>,-): ToolDefinition<Schema>;--export function defineTool<- Schema extends zod.ZodRawShape,- Args extends ParsedArguments = ParsedArguments,->(- definition: (args?: Args) => ToolDefinition<Schema>,-): (args?: Args) => ToolDefinition<Schema>;--export function defineTool<- Schema extends zod.ZodRawShape,- Args extends ParsedArguments = ParsedArguments,->(- definition:- ToolDefinition<Schema> | ((args?: Args) => ToolDefinition<Schema>),-) {- if (typeof definition === 'function') {- const factory = definition;- return (args: Args) => {- return factory(args);- };- }+ definition: (args: ParsedArguments) => ToolDefinition<Schema>,+): (args: ParsedArguments) => ToolDefinition<Schema> {return definition;}interface PageToolDefinition<Schema extends zod.ZodRawShape = zod.ZodRawShape,> extends BaseToolDefinition<Schema> {- handler: (+ handler(request: Request<Schema> & {page: ContextPage},response: Response,context: Context,- ) => Promise<void>;+ ): Promise<void>;}export type DefinedPageTool<Schema extends zod.ZodRawShape = zod.ZodRawShape> =- PageToolDefinition<Schema> & {+ Omit<PageToolDefinition<Schema>, 'schema'> & {+ schema: Schema & Partial<typeof pageIdSchema>;pageScoped: true;- handler: (+ handler(request: Request<Schema> & {page: ContextPage},response: Response,context: Context,- ) => Promise<void>;+ ): Promise<void>;};export function definePageTool<Schema extends zod.ZodRawShape>(- definition: PageToolDefinition<Schema>,-): DefinedPageTool<Schema>;--export function definePageTool<- Schema extends zod.ZodRawShape,- Args extends ParsedArguments = ParsedArguments,->(- definition: (args?: Args) => PageToolDefinition<Schema>,-): (args?: Args) => DefinedPageTool<Schema>;--export function definePageTool<- Schema extends zod.ZodRawShape,- Args extends ParsedArguments = ParsedArguments,->(- definition:- PageToolDefinition<Schema> | ((args?: Args) => PageToolDefinition<Schema>),-): DefinedPageTool<Schema> | ((args?: Args) => DefinedPageTool<Schema>) {- if (typeof definition === 'function') {- return (args?: Args): DefinedPageTool<Schema> => {- const tool = definition(args);- return {- ...tool,- pageScoped: true,- };+ definition: (args: ParsedArguments) => PageToolDefinition<Schema>,+): (args: ParsedArguments) => DefinedPageTool<Schema> {+ return (args: ParsedArguments): DefinedPageTool<Schema> => {+ const tool = definition(args);+ return {+ ...tool,+ schema: {+ ...(args.pageIdRouting && !args.slim ? pageIdSchema : {}),+ ...tool.schema,+ },+ pageScoped: true,};- }-- return {- ...definition,- pageScoped: true,- } as DefinedPageTool<Schema>;+ };}export const CLOSE_PAGE_ERROR =diff --git a/src/tools/comments.ts b/src/tools/comments.tsindex f6d6fdcb..861046e2 100644--- a/src/tools/comments.ts+++ b/src/tools/comments.ts@@ -19,7 +19,7 @@ export type CommentThreadPayload = CD4ACommentThread;export type CommentEditorPayload = CD4AEditorAnchorSignature;export type RevealTargetPayload = CD4ARevealTarget;-export const openDevtools = definePageTool({+export const openDevtools = definePageTool(() => ({name: 'open_devtools',description: 'Open a DevTools window for the selected page.',annotations: {@@ -41,9 +41,9 @@ export const openDevtools = definePageTool({}response.setIncludePages(true);},-});+}));-export const getDevtoolsComments = definePageTool({+export const getDevtoolsComments = definePageTool(() => ({name: 'get_devtools_comments',description: 'Retrieve user comments from the DevTools window for the page.',annotations: {@@ -70,9 +70,9 @@ export const getDevtoolsComments = definePageTool({response.setDevToolsComments(threads);},-});+}));-export const resolveDevtoolsComment = definePageTool({+export const resolveDevtoolsComment = definePageTool(() => ({name: 'resolve_devtools_comment',description:'Append an agent reply to a DevTools comment thread and mark it as resolved.',@@ -130,9 +130,9 @@ export const resolveDevtoolsComment = definePageTool({);}},-});+}));-export const revealInDevtools = definePageTool({+export const revealInDevtools = definePageTool(() => ({name: 'reveal_in_devtools',description:'Navigate DevTools to a specified panel and highlight a target DOM node or network request. The parameters uid and reqid are mutually exclusive.',@@ -222,4 +222,4 @@ export const revealInDevtools = definePageTool({response.appendResponseLine(`Revealed target${targetDesc} in DevTools.`);}},-});+}));diff --git a/src/tools/console.ts b/src/tools/console.tsindex 53d11a97..47272924 100644--- a/src/tools/console.ts+++ b/src/tools/console.ts@@ -106,7 +106,7 @@ export const listConsoleMessages = definePageTool(cliArgs => {};});-export const getConsoleMessage = definePageTool({+export const getConsoleMessage = definePageTool(() => ({name: 'get_console_message',description: `Gets a console message by its ID. You can get all messages by calling ${LIST_CONSOLE_MESSAGES_TOOL_NAME}.`,annotations: {@@ -125,4 +125,4 @@ export const getConsoleMessage = definePageTool({handler: async (request, response) => {response.attachConsoleMessage(request.params.msgid);},-});+}));diff --git a/src/tools/css.ts b/src/tools/css.tsindex abb84f15..d0849e66 100644--- a/src/tools/css.ts+++ b/src/tools/css.ts@@ -9,7 +9,7 @@ import {zod} from '../third_party/index.js';import {ToolCategory} from './categories.js';import {definePageTool} from './ToolDefinition.js';-export const getCssStyles = definePageTool({+export const getCssStyles = definePageTool(() => ({name: 'get_css_styles',description: `Retrieve matched CSS rules, inline styles, inherited styles, and cascade information for an element identified by its UID.Use this tool to debug why specific CSS properties are applied, overridden, or conflicting. Supports pagination for elements with many matched rules. Requires a UID from take_snapshot.`,@@ -52,4 +52,4 @@ Use this tool to debug why specific CSS properties are applied, overridden, or cpageIdx: request.params.pageIdx,});},-});+}));diff --git a/src/tools/emulation.ts b/src/tools/emulation.tsindex 2abd6051..a389004e 100644--- a/src/tools/emulation.ts+++ b/src/tools/emulation.ts@@ -45,7 +45,7 @@ const throttlingOptions: [string, ...string[]] = [...Object.keys(PredefinedNetworkConditions),];-export const emulate = definePageTool({+export const emulate = definePageTool(() => ({name: 'emulate',description: `Emulates various features on the target page.`,annotations: {@@ -106,4 +106,4 @@ export const emulate = definePageTool({await page.emulate(request.params);response.appendResponseLine('Emulation configured successfully');},-});+}));diff --git a/src/tools/extensions.ts b/src/tools/extensions.tsindex e9489274..1c291919 100644--- a/src/tools/extensions.ts+++ b/src/tools/extensions.ts@@ -9,7 +9,7 @@ import {zod} from '../third_party/index.js';import {ToolCategory} from './categories.js';import {defineTool} from './ToolDefinition.js';-export const installExtension = defineTool({+export const installExtension = defineTool(() => ({name: 'install_extension',description: 'Installs a Chrome extension from the given path.',annotations: {@@ -30,9 +30,9 @@ export const installExtension = defineTool({const id = await context.installExtension(path);response.appendResponseLine(`Extension installed. Id: ${id}`);},-});+}));-export const uninstallExtension = defineTool({+export const uninstallExtension = defineTool(() => ({name: 'uninstall_extension',description: 'Uninstalls a Chrome extension by its ID.',annotations: {@@ -49,9 +49,9 @@ export const uninstallExtension = defineTool({await context.uninstallExtension(id);response.appendResponseLine(`Extension uninstalled. Id: ${id}`);},-});+}));-export const listExtensions = defineTool({+export const listExtensions = defineTool(() => ({name: 'list_extensions',description:'Lists all the Chrome extensions installed in the browser. This includes their name, ID, version, and enabled status.',@@ -65,9 +65,9 @@ export const listExtensions = defineTool({handler: async (_request, response) => {response.setListExtensions();},-});+}));-export const reloadExtension = defineTool({+export const reloadExtension = defineTool(() => ({name: 'reload_extension',description: 'Reloads an unpacked Chrome extension by its ID.',annotations: {@@ -88,9 +88,9 @@ export const reloadExtension = defineTool({await context.installExtension(extension.path);response.appendResponseLine('Extension reloaded.');},-});+}));-export const triggerExtensionAction = defineTool({+export const triggerExtensionAction = defineTool(() => ({name: 'trigger_extension_action',description: 'Triggers the default action of an extension by its ID.',annotations: {@@ -107,4 +107,4 @@ export const triggerExtensionAction = defineTool({await context.triggerExtensionAction(id);response.appendResponseLine(`Extension action triggered for ID ${id}`);},-});+}));diff --git a/src/tools/input.ts b/src/tools/input.tsindex ac3119be..5f683aa5 100644--- a/src/tools/input.ts+++ b/src/tools/input.ts@@ -81,7 +81,7 @@ async function selectNativeSelectOption(handle: ElementHandle<Element>) {return true;}-export const click = definePageTool({+export const click = definePageTool(() => ({name: 'click',description: `Clicks on the provided element`,annotations: {@@ -131,9 +131,9 @@ export const click = definePageTool({handleActionError(error, uid);}},-});+}));-export const clickAt = definePageTool({+export const clickAt = definePageTool(() => ({name: 'click_at',description: `Clicks at the provided coordinates`,annotations: {@@ -166,9 +166,9 @@ export const clickAt = definePageTool({response.includeSnapshot();}},-});+}));-export const hover = definePageTool({+export const hover = definePageTool(() => ({name: 'hover',description: `Hover over the provided element`,annotations: {@@ -201,7 +201,7 @@ export const hover = definePageTool({handleActionError(error, uid);}},-});+}));// The AXNode for an option doesn't contain its `value`. We set text content of the option as value.// If the form is a combobox, we need to find the correct option by its text value.@@ -281,7 +281,7 @@ async function fillFormElement(}}-export const fill = definePageTool({+export const fill = definePageTool(() => ({name: 'fill',description: `Type text into an input, text area or select an option from a <select> element.`,annotations: {@@ -319,9 +319,9 @@ export const fill = definePageTool({response.includeSnapshot();}},-});+}));-export const typeText = definePageTool({+export const typeText = definePageTool(() => ({name: 'type_text',description: `Type text using keyboard into a previously focused input`,annotations: {@@ -349,9 +349,9 @@ export const typeText = definePageTool({);response.attachWaitForResult(result);},-});+}));-export const drag = definePageTool({+export const drag = definePageTool(() => ({name: 'drag',description: `Drag an element onto another element`,annotations: {@@ -382,9 +382,9 @@ export const drag = definePageTool({response.includeSnapshot();}},-});+}));-export const fillForm = definePageTool({+export const fillForm = definePageTool(() => ({name: 'fill_form',description: `Fill out multiple form elements (inputs, selects, checkboxes, radios) at once. ALWAYS prefer this tool over multiple individual 'fill' or 'click' calls when interacting with forms. It is significantly faster, more reliable, and reduces turn count. Example: Fill username, password, and check "Remember Me" in one call.`,annotations: {@@ -428,9 +428,9 @@ export const fillForm = definePageTool({response.includeSnapshot();}},-});+}));-export const uploadFile = definePageTool({+export const uploadFile = definePageTool(() => ({name: 'upload_file',description: 'Upload a file through a provided element.',annotations: {@@ -489,9 +489,9 @@ export const uploadFile = definePageTool({}response.appendResponseLine(`File uploaded from ${filePaths.join(', ')}.`);},-});+}));-export const pressKey = definePageTool({+export const pressKey = definePageTool(() => ({name: 'press_key',description: `Press a key or key combination. Use this when other input methods like fill() cannot be used (e.g., keyboard shortcuts, navigation keys, or special key combinations).`,annotations: {@@ -539,4 +539,4 @@ export const pressKey = definePageTool({response.includeSnapshot();}},-});+}));diff --git a/src/tools/lighthouse.ts b/src/tools/lighthouse.tsindex 9cb7579e..6ac7479f 100644--- a/src/tools/lighthouse.ts+++ b/src/tools/lighthouse.ts@@ -19,9 +19,9 @@ import {ToolCategory} from './categories.js';import {startTrace} from './performance.js';import {definePageTool} from './ToolDefinition.js';-export const lighthouseAudit = definePageTool({+export const lighthouseAudit = definePageTool(args => ({name: 'lighthouse_audit',- description: `Get Lighthouse score and reports for accessibility, SEO, best practices, and agentic browsing. This excludes performance. For performance audits, run ${startTrace.name}`,+ description: `Get Lighthouse score and reports for accessibility, SEO, best practices, and agentic browsing. This excludes performance. For performance audits, run ${startTrace(args).name}`,annotations: {category: ToolCategory.DEBUGGING,readOnlyHint: false,@@ -175,4 +175,4 @@ export const lighthouseAudit = definePageTool({response.attachLighthouseResult(output);},-});+}));diff --git a/src/tools/memory.ts b/src/tools/memory.tsindex db25dfdf..16955220 100644--- a/src/tools/memory.ts+++ b/src/tools/memory.ts@@ -20,7 +20,7 @@ const HEAP_SNAPSHOT_FILTERS: readonly [string, ...string[]] = ['attributedToSpecificNativeContext',];-export const takeHeapSnapshot = definePageTool({+export const takeHeapSnapshot = definePageTool(() => ({name: 'take_heapsnapshot',description: `Capture a heap snapshot of the target page. Use to analyze the memory distribution of JavaScript objects and debug memory leaks.`,annotations: {@@ -49,9 +49,9 @@ export const takeHeapSnapshot = definePageTool({response.appendResponseLine(`Heap snapshot saved to ${snapshotPath}`);},-});+}));-export const getHeapSnapshotSummary = defineTool({+export const getHeapSnapshotSummary = defineTool(() => ({name: 'get_heapsnapshot_summary',description:'Loads a memory heapsnapshot and returns snapshot summary stats, including native contexts and their sizes, and retained by context summary.',@@ -87,9 +87,9 @@ export const getHeapSnapshotSummary = defineTool({retainedByContextSummary,);},-});+}));-export const getHeapSnapshotDetails = defineTool({+export const getHeapSnapshotDetails = defineTool(() => ({name: 'get_heapsnapshot_details',description:'Loads a memory heapsnapshot and returns all available information including statistics, static data, and aggregated node information. Supports pagination for aggregates.',@@ -135,9 +135,9 @@ export const getHeapSnapshotDetails = defineTool({pageSize: request.params.pageSize,});},-});+}));-export const getHeapSnapshotClassNodes = defineTool({+export const getHeapSnapshotClassNodes = defineTool(() => ({name: 'get_heapsnapshot_class_nodes',description:'Loads a memory heapsnapshot and returns instances of a specific class with their IDs.',@@ -179,9 +179,9 @@ export const getHeapSnapshotClassNodes = defineTool({pageSize: request.params.pageSize,});},-});+}));-export const getHeapSnapshotRetainers = defineTool({+export const getHeapSnapshotRetainers = defineTool(() => ({name: 'get_heapsnapshot_retainers',description:'Loads a memory heapsnapshot and returns retainers for a specific node ID.',@@ -211,9 +211,9 @@ export const getHeapSnapshotRetainers = defineTool({pageSize: request.params.pageSize,});},-});+}));-export const closeHeapSnapshot = defineTool({+export const closeHeapSnapshot = defineTool(() => ({name: 'close_heapsnapshot',description:'Closes a previously loaded memory heapsnapshot, freeing its memory.',@@ -242,9 +242,9 @@ export const closeHeapSnapshot = defineTool({`Closed heap snapshot: ${request.params.filePath}`,);},-});+}));-export const getHeapSnapshotRetainingPaths = defineTool({+export const getHeapSnapshotRetainingPaths = defineTool(() => ({name: 'get_heapsnapshot_retaining_paths',description:'Loads a memory heapsnapshot and returns retaining paths for a specific node ID. This helps to understand why a node is not being garbage collected.',@@ -284,9 +284,9 @@ export const getHeapSnapshotRetainingPaths = defineTool({response.setHeapSnapshotRetainingPaths(retainingPaths);},-});+}));-export const getHeapSnapshotEdges = defineTool({+export const getHeapSnapshotEdges = defineTool(() => ({name: 'get_heapsnapshot_edges',description:'Loads a memory heapsnapshot and returns outgoing edges (references) for a specific node ID.',@@ -333,9 +333,9 @@ export const getHeapSnapshotEdges = defineTool({pageSize: request.params.pageSize,});},-});+}));-export const getHeapSnapshotDominators = defineTool({+export const getHeapSnapshotDominators = defineTool(() => ({name: 'get_heapsnapshot_dominators',description:'Loads a memory heapsnapshot and returns the dominator chain for a specific node ID. This helps to identify which objects are keeping the target node alive.',@@ -362,9 +362,9 @@ export const getHeapSnapshotDominators = defineTool({response.setHeapSnapshotDominators(dominators);},-});+}));-export const compareHeapSnapshots = defineTool({+export const compareHeapSnapshots = defineTool(() => ({name: 'compare_heapsnapshots',description:'Loads two memory heapsnapshots and returns the comparison. If classIndex is provided, returns detailed diff for that class, otherwise returns summary diff.',@@ -408,9 +408,9 @@ export const compareHeapSnapshots = defineTool({response.setHeapSnapshotClassDiffs(diff);}},-});+}));-export const getHeapSnapshotDuplicateStrings = defineTool({+export const getHeapSnapshotDuplicateStrings = defineTool(() => ({name: 'get_heapsnapshot_duplicate_strings',description:'Loads a memory heapsnapshot and returns duplicate strings grouped by their value.',@@ -438,9 +438,9 @@ export const getHeapSnapshotDuplicateStrings = defineTool({pageSize: request.params.pageSize,});},-});+}));-export const getHeapSnapshotObjectDetails = defineTool({+export const getHeapSnapshotObjectDetails = defineTool(() => ({name: 'get_heapsnapshot_object_details',description:'Loads a memory heapsnapshot and returns detailed information about a specific object by its node ID, including size, type, distance, and DOM detachedness.',@@ -465,9 +465,9 @@ export const getHeapSnapshotObjectDetails = defineTool({response.setHeapSnapshotObjectDetails(objectInfo);},-});+}));-export const queryHeapSnapshotObjects = defineTool({+export const queryHeapSnapshotObjects = defineTool(() => ({name: 'query_heapsnapshot_objects',description:'Loads a memory heapsnapshot and queries objects matching specific filters (className, propertyName, nodeType, retainedSize, selfSize, isDetached, sortBy).',@@ -532,4 +532,4 @@ export const queryHeapSnapshotObjects = defineTool({pageSize: request.params.pageSize,});},-});+}));diff --git a/src/tools/network.ts b/src/tools/network.tsindex 20412555..fd124b9f 100644--- a/src/tools/network.ts+++ b/src/tools/network.ts@@ -32,7 +32,7 @@ const FILTERABLE_RESOURCE_TYPES: readonly [ResourceType, ...ResourceType[]] = ['other',];-export const listNetworkRequests = definePageTool({+export const listNetworkRequests = definePageTool(() => ({name: 'list_network_requests',description: `Lists the most recent requests for the target page since the last navigation.`,annotations: {@@ -86,9 +86,9 @@ export const listNetworkRequests = definePageTool({networkRequestIdInDevToolsUI: reqid,});},-});+}));-export const getNetworkRequest = definePageTool({+export const getNetworkRequest = definePageTool(() => ({name: 'get_network_request',description: `Gets a network request by an optional reqid, if omitted returns the currently selected request in the DevTools Network panel. Useful for inspecting request headers (including 'Cookie') and response headers (including 'Set-Cookie' and directives).`,annotations: {@@ -144,4 +144,4 @@ export const getNetworkRequest = definePageTool({}}},-});+}));diff --git a/src/tools/pages.ts b/src/tools/pages.tsindex ea06ee26..5d836059 100644--- a/src/tools/pages.ts+++ b/src/tools/pages.ts@@ -36,7 +36,7 @@ export const listPages = defineTool(args => {};});-export const selectPage = defineTool({+export const selectPage = defineTool(args => ({name: 'select_page',description: `Select a page as a context for future tool calls.`,annotations: {@@ -47,7 +47,7 @@ export const selectPage = defineTool({pageId: zod.number().describe(- `The ID of the page to select. Call ${listPages().name} to get available pages.`,+ `The ID of the page to select. Call ${listPages(args).name} to get available pages.`,),bringToFront: zod.boolean()@@ -66,9 +66,9 @@ export const selectPage = defineTool({await page.pptrPage.bringToFront();}},-});+}));-export const closePage = defineTool({+export const closePage = defineTool(() => ({name: 'close_page',description: `Closes the page by its index. The last open page cannot be closed.`,annotations: {@@ -95,7 +95,7 @@ export const closePage = defineTool({response.setIncludePages(true);response.setListThirdPartyDeveloperTools();},-});+}));export const newPage = defineTool(args => {return {@@ -311,7 +311,7 @@ export const navigatePage = definePageTool(args => {};});-export const resizePage = definePageTool({+export const resizePage = definePageTool(() => ({name: 'resize_page',description: `Resizes the page's window so that the page has specified dimension`,annotations: {@@ -350,9 +350,9 @@ export const resizePage = definePageTool({response.setIncludePages(true);},-});+}));-export const handleDialog = definePageTool({+export const handleDialog = definePageTool(() => ({name: 'handle_dialog',description: `If a browser dialog was opened, use this command to handle it`,annotations: {@@ -403,9 +403,9 @@ export const handleDialog = definePageTool({page.clearDialog();response.setIncludePages(true);},-});+}));-export const getTabId = definePageTool({+export const getTabId = definePageTool(() => ({name: 'get_tab_id',description: `Get the tab ID of the page`,annotations: {@@ -422,4 +422,4 @@ export const getTabId = definePageTool({response.setTabId(tabId);response.appendResponseLine(`Tab ID: ${tabId}`);},-});+}));diff --git a/src/tools/performance.ts b/src/tools/performance.tsindex 32127756..810ee2d9 100644--- a/src/tools/performance.ts+++ b/src/tools/performance.ts@@ -25,7 +25,7 @@ const filePathSchema = zod'The absolute file path, or a file path relative to the current working directory, to save the raw trace data. For example, trace.json.gz (compressed) or trace.json (uncompressed).',);-export const startTrace = definePageTool({+export const startTrace = definePageTool(() => ({name: 'performance_start_trace',description: `Start a performance trace on the target webpage. Use to find frontend performance issues, Core Web Vitals (LCP, INP, CLS), and improve page load speed.`,annotations: {@@ -121,9 +121,9 @@ export const startTrace = definePageTool({throw error;}},-});+}));-export const stopTrace = definePageTool({+export const stopTrace = definePageTool(() => ({name: 'performance_stop_trace',description:'Stop the active performance trace recording on the target webpage.',@@ -150,9 +150,9 @@ export const stopTrace = definePageTool({request.params.filePath,);},-});+}));-export const analyzeInsight = definePageTool({+export const analyzeInsight = definePageTool(() => ({name: 'performance_analyze_insight',description:'Provides more detailed information on a specific Performance Insight of an insight set that was highlighted in the results of a trace recording.',@@ -189,7 +189,7 @@ export const analyzeInsight = definePageTool({request.params.insightName as InsightName,);},-});+}));async function stopTracingAndAppendOutput(page: ContextPage,diff --git a/src/tools/pwa.ts b/src/tools/pwa.tsindex 9c4f7a5b..72d77a1a 100644--- a/src/tools/pwa.ts+++ b/src/tools/pwa.ts@@ -28,7 +28,7 @@ const displayModeSchema = zod'app-window experience.',);-export const installPwa = defineTool({+export const installPwa = defineTool(() => ({name: 'install_pwa',description:'Installs a Progressive Web App (PWA) identified by its manifest ID. ' +@@ -72,9 +72,9 @@ export const installPwa = defineTool({response.appendResponseLine(`Display mode set to: ${displayMode}`);}},-});+}));-export const uninstallPwa = defineTool({+export const uninstallPwa = defineTool(() => ({name: 'uninstall_pwa',description:'Uninstalls a Progressive Web App identified by its manifest ID and ' +@@ -96,9 +96,9 @@ export const uninstallPwa = defineTool({);response.setIncludePages(true);},-});+}));-export const launchPwa = defineTool({+export const launchPwa = defineTool(() => ({name: 'launch_pwa',description:'Launches an installed Progressive Web App using its saved display mode. ' +@@ -127,9 +127,9 @@ export const launchPwa = defineTool({);response.setIncludePages(true);},-});+}));-export const getOsAppState = defineTool({+export const getOsAppState = defineTool(() => ({name: 'get_os_app_state',description:'Returns the OS integration state (badge count and registered file ' +@@ -152,4 +152,4 @@ export const getOsAppState = defineTool({`File handlers: ${JSON.stringify(state.fileHandlers)}`,);},-});+}));diff --git a/src/tools/screencast.ts b/src/tools/screencast.tsindex ee8cc6a2..966f1bf9 100644--- a/src/tools/screencast.ts+++ b/src/tools/screencast.ts@@ -117,12 +117,12 @@ export const startScreencast = definePageTool(args => ({context.setScreenRecorder({recorder, filePath: resolvedPath});response.appendResponseLine(- `Screencast recording started. The recording will be saved to ${resolvedPath}. Use ${stopScreencast.name} to stop recording.`,+ `Screencast recording started. The recording will be saved to ${resolvedPath}. Use ${stopScreencast(args).name} to stop recording.`,);},}));-export const stopScreencast = definePageTool({+export const stopScreencast = definePageTool(() => ({name: 'screencast_stop',description: 'Stops the active screencast recording on the target page.',annotations: {@@ -150,4 +150,4 @@ export const stopScreencast = definePageTool({context.setScreenRecorder(null);}},-});+}));diff --git a/src/tools/screenshot.ts b/src/tools/screenshot.tsindex 6465cd2a..fa7ea8de 100644--- a/src/tools/screenshot.ts+++ b/src/tools/screenshot.ts@@ -128,7 +128,7 @@ export const screenshot = definePageTool(args => {screenshotQuality,screenshotMaxWidth,screenshotMaxHeight,- } = args ?? {};+ } = args;const defaultFormat: ScreenshotFormat = screenshotFormat ?? 'png';diff --git a/src/tools/script.ts b/src/tools/script.tsindex d0631126..7307de42 100644--- a/src/tools/script.ts+++ b/src/tools/script.ts@@ -17,14 +17,14 @@ export type Evaluatable = Page | Frame | WebWorker;export const evaluateScript = defineTool(cliArgs => {return {name: 'evaluate_script',- description: `Evaluate a JavaScript function inside the target page${cliArgs?.categoryExtensions ? ' or service worker' : ''}. Returns the response as JSON, so returned values have to be JSON-serializable.`,+ description: `Evaluate a JavaScript function inside the target page${cliArgs.categoryExtensions ? ' or service worker' : ''}. Returns the response as JSON, so returned values have to be JSON-serializable.`,annotations: {category: ToolCategory.DEBUGGING,readOnlyHint: false,conditions: ['javascriptEvaluation'],},schema: {- ...(cliArgs?.pageIdRouting+ ...(cliArgs.pageIdRouting? cliArgs.categoryExtensions? {pageId: zod@@ -70,7 +70,7 @@ Example with arguments: \`(el) => el.innerText\`.describe('Whether to wait for the DOM to settle. Pass false if the script only reads data. Defaults to true.',),- ...(cliArgs?.categoryExtensions+ ...(cliArgs.categoryExtensions? {serviceWorkerId: zod.string()@@ -96,7 +96,7 @@ Example with arguments: \`(el) => el.innerText\`waitForStableDom,} = request.params;- if (cliArgs?.categoryExtensions && serviceWorkerId) {+ if (cliArgs.categoryExtensions && serviceWorkerId) {if (uidArgs && uidArgs.length > 0) {throw new Error('args (element uids) cannot be used when evaluating in a service worker.',@@ -126,12 +126,12 @@ Example with arguments: \`(el) => el.innerText\`return;}- if (cliArgs?.categoryExtensions && cliArgs?.pageIdRouting && !pageId) {+ if (cliArgs.categoryExtensions && cliArgs.pageIdRouting && !pageId) {throw new Error('specify either a pageId or a serviceWorkerId.');}const mcpPage =- cliArgs?.pageIdRouting && request.params.pageId+ cliArgs.pageIdRouting && request.params.pageId? context.getPageById(request.params.pageId): context.getSelectedMcpPage();const page: Page = mcpPage.pptrPage;@@ -168,7 +168,7 @@ const performEvaluation = async (fnString: string,args: Array<JSHandle<unknown>>,response: Response,- options?: {filePath: string; context: Context},+ options?: {filePath?: string; context: Context},) => {using fn = await evaluatable.evaluateHandle(`(${fnString})`);diff --git a/src/tools/slim/tools.ts b/src/tools/slim/tools.tsindex c0bc9660..5b7e873e 100644--- a/src/tools/slim/tools.ts+++ b/src/tools/slim/tools.ts@@ -10,7 +10,7 @@ import {ToolCategory} from '../categories.js';import {definePageTool} from '../ToolDefinition.js';import {validateUrl} from '../../utils/url.js';-export const screenshot = definePageTool({+export const screenshot = definePageTool(() => ({name: 'screenshot',description: `Takes a screenshot`,annotations: {@@ -33,7 +33,7 @@ export const screenshot = definePageTool({);response.appendResponseLine(filepath);},-});+}));export const navigate = definePageTool(args => {return {@@ -81,7 +81,7 @@ export const navigate = definePageTool(args => {};});-export const evaluate = definePageTool({+export const evaluate = definePageTool(() => ({name: 'evaluate',description: `Evaluates a JavaScript script`,annotations: {@@ -103,4 +103,4 @@ export const evaluate = definePageTool({response.appendResponseLine(String(err.message));}},-});+}));diff --git a/src/tools/snapshot.ts b/src/tools/snapshot.tsindex 8724de7b..94c6276d 100644--- a/src/tools/snapshot.ts+++ b/src/tools/snapshot.ts@@ -9,7 +9,7 @@ import {zod} from '../third_party/index.js';import {ToolCategory} from './categories.js';import {definePageTool, timeoutSchema} from './ToolDefinition.js';-export const takeSnapshot = definePageTool({+export const takeSnapshot = definePageTool(() => ({name: 'take_snapshot',description: `Take a text snapshot of the target page based on the a11y tree. The snapshot lists page elements along with a uniqueidentifier (uid). Always use the latest snapshot. Prefer taking a snapshot over taking a screenshot. The snapshot indicates the element selected@@ -43,9 +43,9 @@ in the DevTools Elements panel (if any).`,filePath: request.params.filePath,});},-});+}));-export const waitFor = definePageTool({+export const waitFor = definePageTool(() => ({name: 'wait_for',description: `Wait for the specified text to appear on the selected page.`,annotations: {@@ -73,4 +73,4 @@ export const waitFor = definePageTool({response.includeSnapshot();},-});+}));diff --git a/src/tools/thirdPartyDeveloper.ts b/src/tools/thirdPartyDeveloper.tsindex f60450f5..d931ee02 100644--- a/src/tools/thirdPartyDeveloper.ts+++ b/src/tools/thirdPartyDeveloper.ts@@ -42,7 +42,7 @@ declare global {}}-export const listThirdPartyDeveloperTools = definePageTool({+export const listThirdPartyDeveloperTools = definePageTool(() => ({name: 'list_3p_developer_tools',description: `Lists all third-party developer tools the page exposes for providing runtime information.Third-party developer tools can be called via the 'execute_3p_developer_tool()' MCP tool.@@ -61,9 +61,9 @@ third-party developer tools with additional functionality.`,handler: async (_request, response) => {response.setListThirdPartyDeveloperTools();},-});+}));-export const executeThirdPartyDeveloperTool = definePageTool({+export const executeThirdPartyDeveloperTool = definePageTool(() => ({name: 'execute_3p_developer_tool',description: `Executes a tool exposed by the page.`,annotations: {@@ -124,4 +124,4 @@ export const executeThirdPartyDeveloperTool = definePageTool({response,);},-});+}));diff --git a/src/tools/tools.ts b/src/tools/tools.tsindex 63bd3e6f..7e04ce97 100644--- a/src/tools/tools.ts+++ b/src/tools/tools.ts@@ -24,7 +24,7 @@ import * as scriptTools from './script.js';import * as slimTools from './slim/tools.js';import * as snapshotTools from './snapshot.js';import * as thirdPartyDeveloperTools from './thirdPartyDeveloper.js';-import type {ToolDefinition} from './ToolDefinition.js';+import type {DefinedPageTool, ToolDefinition} from './ToolDefinition.js';import * as webmcpTools from './webmcp.js';export const createTools = (args: ParsedArguments) => {@@ -51,13 +51,9 @@ export const createTools = (args: ParsedArguments) => {...Object.values(webmcpTools),];- const tools = [];+ const tools: Array<ToolDefinition | DefinedPageTool> = [];for (const tool of rawTools) {- if (typeof tool === 'function') {- tools.push(tool(args) as unknown as ToolDefinition);- } else {- tools.push(tool as ToolDefinition);- }+ tools.push(tool(args));}tools.sort((a, b) => {diff --git a/src/tools/webmcp.ts b/src/tools/webmcp.tsindex d3badfe9..0779d44e 100644--- a/src/tools/webmcp.ts+++ b/src/tools/webmcp.ts@@ -9,7 +9,7 @@ import {zod} from '../third_party/index.js';import {ToolCategory} from './categories.js';import {definePageTool} from './ToolDefinition.js';-export const listWebMcpTools = definePageTool({+export const listWebMcpTools = definePageTool(() => ({name: 'list_webmcp_tools',description: `Lists all WebMCP tools the page exposes.`,annotations: {@@ -22,9 +22,9 @@ export const listWebMcpTools = definePageTool({handler: async (_request, response) => {response.setListWebMcpTools();},-});+}));-export const executeWebMcpTool = definePageTool({+export const executeWebMcpTool = definePageTool(() => ({name: 'execute_webmcp_tool',description: `Executes a WebMCP tool exposed by the page.`,annotations: {@@ -69,4 +69,4 @@ export const executeWebMcpTool = definePageTool({JSON.stringify({status, output, errorText}, null, 2),);},-});+}));diff --git a/tests/McpResponse.test.ts b/tests/McpResponse.test.tsindex b91a4a51..80e70e87 100644--- a/tests/McpResponse.test.ts+++ b/tests/McpResponse.test.ts@@ -972,11 +972,12 @@ describe('third-party developer tools', () => {handlerAction: (response: McpResponse,context: McpContext,+ args: ParsedArguments,) => Promise<void>,toolName: string,) {await withMcpContext(- async (response, context) => {+ async (response, context, args) => {const mcpPage = context.getSelectedMcpPage();stubToolDiscovery(mcpPage.pptrPage);@@ -1005,7 +1006,7 @@ describe('third-party developer tools', () => {await mcpPage.pptrPage.evaluateOnNewDocument(initScript);await mcpPage.pptrPage.evaluate(initScript);- await handlerAction(response, context);+ await handlerAction(response, context, args);const {content} = await response.handle(context);const responseText = getTextContent(content[0]);@@ -1020,54 +1021,67 @@ describe('third-party developer tools', () => {}it('includes third-party developer tools in list_pages response', async () => {- await testIncludesThirdPartyDeveloperTools(async (response, context) => {- const listPagesDef = listPages({- categoryExperimentalThirdParty: true,- } as ParsedArguments);- await listPagesDef.handler({params: {}}, response, context);- }, 'list_pages');+ await testIncludesThirdPartyDeveloperTools(+ async (response, context, args) => {+ const listPagesDef = listPages(args);+ await listPagesDef.handler({params: {}}, response, context);+ },+ 'list_pages',+ );});it('includes third-party developer tools in select_page response', async () => {- await testIncludesThirdPartyDeveloperTools(async (response, context) => {- const pageId = context.getSelectedMcpPage().id;- await selectPage.handler({params: {pageId}}, response, context);- }, 'select_page');+ await testIncludesThirdPartyDeveloperTools(+ async (response, context, args) => {+ const pageId = context.getSelectedMcpPage().id;+ await selectPage(args).handler({params: {pageId}}, response, context);+ },+ 'select_page',+ );});it('includes third-party developer tools in close_page response', async () => {- await testIncludesThirdPartyDeveloperTools(async (response, context) => {- const pageId = context.getSelectedMcpPage().id;- await closePage.handler({params: {pageId}}, response, context);- }, 'close_page');+ await testIncludesThirdPartyDeveloperTools(+ async (response, context, args) => {+ const pageId = context.getSelectedMcpPage().id;+ await closePage(args).handler({params: {pageId}}, response, context);+ },+ 'close_page',+ );});it('includes third-party developer tools in navigate_page response', async () => {- await testIncludesThirdPartyDeveloperTools(async (response, context) => {- await navigatePage().handler(- {- params: {type: 'url', url: 'about:blank'},- page: context.getSelectedMcpPage(),- },- response,- context,- );- }, 'navigate_page');+ await testIncludesThirdPartyDeveloperTools(+ async (response, context, args) => {+ await navigatePage(args).handler(+ {+ params: {type: 'url', url: 'about:blank'},+ page: context.getSelectedMcpPage(),+ },+ response,+ context,+ );+ },+ 'navigate_page',+ );});it('includes third-party developer tools in new_page response', async () => {- await testIncludesThirdPartyDeveloperTools(async (response, context) => {- // Workaround to ensure the test environment's new page contain third-party developer tools- sinon.stub(context, 'newPage').resolves(context.getSelectedMcpPage());+ await testIncludesThirdPartyDeveloperTools(+ async (response, context, args) => {+ // Workaround to ensure the test environment's new page contain third-party developer tools+ sinon.stub(context, 'newPage').resolves(context.getSelectedMcpPage());- await newPage().handler(- {- params: {url: 'about:blank'},- },- response,- context,- );- }, 'new_page');+ await newPage(args).handler(+ {+ params: {url: 'about:blank'},+ },+ response,+ context,+ );+ },+ 'new_page',+ );});});@@ -1078,13 +1092,14 @@ describe('webmcp', () => {handlerAction: (response: McpResponse,context: McpContext,+ args: ParsedArguments,) => Promise<void>,) {await withMcpContext(- async (response, context) => {+ async (response, context, args) => {response.setListWebMcpTools();- await handlerAction(response, context);+ await handlerAction(response, context, args);const page = context.getSelectedMcpPage().pptrPage;const {resolve, promise} = Promise.withResolvers();@@ -1113,8 +1128,8 @@ describe('webmcp', () => {await testIncludesWebmcpTools(t,{categoryExperimentalWebmcp: true},- async (response, context) => {- await listPages().handler({params: {}}, response, context);+ async (response, context, args) => {+ await listPages(args).handler({params: {}}, response, context);},);});@@ -1123,9 +1138,9 @@ describe('webmcp', () => {await testIncludesWebmcpTools(t,{categoryExperimentalWebmcp: true},- async (response, context) => {+ async (response, context, args) => {const pageId = context.getSelectedMcpPage().id;- await selectPage.handler({params: {pageId}}, response, context);+ await selectPage(args).handler({params: {pageId}}, response, context);},);});@@ -1134,8 +1149,8 @@ describe('webmcp', () => {await testIncludesWebmcpTools(t,{categoryExperimentalWebmcp: true},- async (response, context) => {- await navigatePage().handler(+ async (response, context, args) => {+ await navigatePage(args).handler({params: {type: 'url', url: 'about:blank'},page: context.getSelectedMcpPage(),@@ -1165,8 +1180,8 @@ describe('webmcp', () => {await testIncludesWebmcpTools(t,{categoryExperimentalWebmcp: false},- async (response, context) => {- await navigatePage().handler(+ async (response, context, args) => {+ await navigatePage(args).handler({params: {type: 'url', url: 'about:blank'},page: context.getSelectedMcpPage(),diff --git a/tests/ToolHandler.test.ts b/tests/ToolHandler.test.tsindex 7e94098f..3ee2b96c 100644--- a/tests/ToolHandler.test.ts+++ b/tests/ToolHandler.test.ts@@ -19,10 +19,11 @@ import {ClearcutLogger} from '../src/telemetry/ClearcutLogger.js';import {zod} from '../src/third_party/index.js';import {ToolHandler} from '../src/ToolHandler.js';import {ToolCategory} from '../src/tools/categories.js';-import type {- DefinedPageTool,- DevToolsData,- ToolDefinition,+import {+ definePageTool,+ type DefinedPageTool,+ type DevToolsData,+ type ToolDefinition,} from '../src/tools/ToolDefinition.js';import {createTools} from '../src/tools/tools.js';import {getMockBrowser} from './utils.js';@@ -36,7 +37,10 @@ describe('ToolHandler', () => {it('calls getPageById for page scoped tools when pageId is provided', async () => {let handlerCalled = false;- const tool: DefinedPageTool = {+ const serverArgs = parseArguments('1.0.0', ['node', 'script.js'], {+ CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true',+ });+ const tool = definePageTool(() => ({name: 'page_tool',description: 'A page scoped tool',annotations: {@@ -46,11 +50,10 @@ describe('ToolHandler', () => {schema: {},blockedByDialog: false,verifyFilesSchema: {},- pageScoped: true,handler: async () => {handlerCalled = true;},- };+ }))(serverArgs);const mockContext = sinon.createStubInstance(McpContext);const mockProcess = sinon.createStubInstance(ChildProcess);@@ -59,9 +62,6 @@ describe('ToolHandler', () => {mockContext.getPageById.returns(mockPage);const toolMutex = new Mutex();- const serverArgs = parseArguments('1.0.0', ['node', 'script.js'], {- CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true',- });const toolHandler = new ToolHandler(tool,@@ -80,7 +80,12 @@ describe('ToolHandler', () => {it('calls getSelectedMcpPage for page scoped tools when pageIdRouting is disabled', async () => {let handlerCalled = false;- const tool: DefinedPageTool = {+ const serverArgs = parseArguments(+ '1.0.0',+ ['node', 'script.js', '--no-page-id-routing'],+ {CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true'},+ );+ const tool = definePageTool(() => ({name: 'page_tool',description: 'A page scoped tool',annotations: {@@ -90,11 +95,10 @@ describe('ToolHandler', () => {schema: {},blockedByDialog: false,verifyFilesSchema: {},- pageScoped: true,handler: async () => {handlerCalled = true;},- };+ }))(serverArgs);const mockContext = sinon.createStubInstance(McpContext);const mockProcess = sinon.createStubInstance(ChildProcess);@@ -103,11 +107,6 @@ describe('ToolHandler', () => {mockContext.getSelectedMcpPage.returns(mockPage);const toolMutex = new Mutex();- const serverArgs = parseArguments(- '1.0.0',- ['node', 'script.js', '--no-page-id-routing'],- {CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true'},- );const toolHandler = new ToolHandler(tool,@@ -182,17 +181,20 @@ describe('ToolHandler', () => {},};+ const serverArgs = parseArguments('1.0.0', ['node', 'script.js'], {+ CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true',+ });+const testCases: Array<{tool: ToolDefinition | DefinedPageTool;devToolsData: DevToolsData;pageUrl?: string;}> = [{- tool: {+ tool: definePageTool(() => ({...baseTool,name: 'page_tool',- pageScoped: true,- },+ }))(serverArgs),devToolsData: {cdpBackendNodeId: 1},pageUrl: 'http://localhost:9222/',},@@ -226,9 +228,6 @@ describe('ToolHandler', () => {} as unknown as ClearcutLogger);const toolMutex = new Mutex();- const serverArgs = parseArguments('1.0.0', ['node', 'script.js'], {- CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true',- });const toolHandler = new ToolHandler(testCase.tool,@@ -1055,7 +1054,10 @@ describe('ToolHandler', () => {it('rewrites file paths in params for page scoped tools', async () => {let receivedParams: Record<string, unknown> | undefined;- const tool: DefinedPageTool = {+ const serverArgs = parseArguments('1.0.0', ['node', 'script.js'], {+ CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true',+ });+ const tool = definePageTool(() => ({name: 'page_file_tool',description: 'A page scoped tool with file verification',annotations: {@@ -1069,11 +1071,10 @@ describe('ToolHandler', () => {verifyFilesSchema: {filePath: true,},- pageScoped: true,handler: async request => {receivedParams = request.params;},- };+ }))(serverArgs);const mockContext = sinon.createStubInstance(McpContext);const mockProcess = sinon.createStubInstance(ChildProcess);@@ -1092,9 +1093,6 @@ describe('ToolHandler', () => {mockContext.validatePath.resolves(canonicalFilePath);const toolMutex = new Mutex();- const serverArgs = parseArguments('1.0.0', ['node', 'script.js'], {- CHROME_DEVTOOLS_MCP_NO_USAGE_STATISTICS: 'true',- });const toolHandler = new ToolHandler(tool,diff --git a/tests/mocks.ts b/tests/mocks.tsindex cbca6c19..9bb2942c 100644--- a/tests/mocks.ts+++ b/tests/mocks.ts@@ -188,15 +188,17 @@ export function createMockMcpResponse(): MockMcpResponse {** const {page, context, response} = createHandlerMocks();*/-export function createHandlerMocks(): {+export function createHandlerMocks(options: Partial<ParsedArguments> = {}): {page: MockMcpPage;context: MockMcpContext;response: MockMcpResponse;+ args: ParsedArguments;} {const page = createMockMcpPage();const context = createMockMcpContext({selectedPage: page});const response = createMockMcpResponse();- return {page, context, response};+ const args = createMockParsedArguments(options);+ return {page, context, response, args};}export function createMockRunnerResult(): RunnerResult {diff --git a/tests/network_blocking.test.ts b/tests/network_blocking.test.tsindex 02ff8872..7d114f0b 100644--- a/tests/network_blocking.test.ts+++ b/tests/network_blocking.test.ts@@ -24,9 +24,9 @@ describe('Network Blocking Integration', () => {const blockedUrlPattern = [server.getRoute('/blocked.html')];await withMcpContext(- async (response, context) => {+ async (response, context, args) => {const allowedUrl = server.getRoute('/allowed.html');- await navigatePage().handler(+ await navigatePage(args).handler({params: {url: allowedUrl},page: context.getSelectedMcpPage(),@@ -40,7 +40,7 @@ describe('Network Blocking Integration', () => {);response.resetResponseLineForTesting();- await evaluateScript().handler(+ await evaluateScript(args).handler({params: {function: String(() => document.body.textContent)},},@@ -54,7 +54,7 @@ describe('Network Blocking Integration', () => {const blockedUrl = server.getRoute('/blocked.html');response.resetResponseLineForTesting();- await evaluateScript().handler(+ await evaluateScript(args).handler({params: {function: `async () => {@@ -89,9 +89,9 @@ describe('Network Blocking Integration', () => {const allowedUrlPattern = [server.getRoute('/allowed.html')];await withMcpContext(- async (response, context) => {+ async (response, context, args) => {const allowedUrl = server.getRoute('/allowed.html');- await navigatePage().handler(+ await navigatePage(args).handler({params: {url: allowedUrl},page: context.getSelectedMcpPage(),@@ -105,7 +105,7 @@ describe('Network Blocking Integration', () => {);response.resetResponseLineForTesting();- await evaluateScript().handler(+ await evaluateScript(args).handler({params: {function: String(() => document.body.textContent)},},@@ -119,7 +119,7 @@ describe('Network Blocking Integration', () => {const blockedUrl = server.getRoute('/blocked.html');response.resetResponseLineForTesting();- await evaluateScript().handler(+ await evaluateScript(args).handler({params: {function: `async () => {@@ -153,9 +153,9 @@ describe('Network Blocking Integration', () => {const blockedUrlPattern = [server.getRoute('/blocked.html')];await withMcpContext(- async (response, context) => {+ async (response, context, args) => {const allowedUrl = server.getRoute('/allowed.html');- await navigatePage().handler(+ await navigatePage(args).handler({params: {url: allowedUrl},page: context.getSelectedMcpPage(),@@ -172,7 +172,7 @@ describe('Network Blocking Integration', () => {// Verifies fetch is blocked before Lighthouse auditresponse.resetResponseLineForTesting();- await evaluateScript().handler(+ await evaluateScript(args).handler({params: {function: `async () => {@@ -194,7 +194,7 @@ describe('Network Blocking Integration', () => {'Fetch should be blocked before audit',);- await lighthouseAudit.handler(+ await lighthouseAudit(args).handler({params: {mode: 'navigation',@@ -213,7 +213,7 @@ describe('Network Blocking Integration', () => {// 2. Verify fetch remains blocked AFTER Lighthouse auditresponse.resetResponseLineForTesting();- await evaluateScript().handler(+ await evaluateScript(args).handler({params: {function: `async () => {@@ -244,10 +244,10 @@ describe('Network Blocking Integration', () => {it('throws error when trying to emulate network conditions while blocklist is configured', async () => {const blockedUrlPattern = ['*://*/*'];await withMcpContext(- async (response, context) => {+ async (response, context, args) => {// Attempting to emulate network conditions should throw an error.await assert.rejects(async () => {- await emulate.handler(+ await emulate(args).handler({params: {networkConditions: 'Offline',@@ -260,7 +260,7 @@ describe('Network Blocking Integration', () => {}, /Network throttling is not supported when network blocking \(allowlist\/blocklist\) is configured\./);// Attempting to emulate CPU rate or other things should succeed without errors.- await emulate.handler(+ await emulate(args).handler({params: {cpuThrottlingRate: 2,diff --git a/tests/tools/comments.test.ts b/tests/tools/comments.test.tsindex aab44699..b8350c7f 100644--- a/tests/tools/comments.test.ts+++ b/tests/tools/comments.test.ts@@ -34,11 +34,15 @@ describe('comments tools', () => {describe('get_devtools_comments', () => {it('reports error when DevTools window is not open', async t => {- const {page, context, response} = createHandlerMocks();+ const {page, context, response, args} = createHandlerMocks();const lines = trackResponseLines(response);page.getDevToolsPage.resolves(undefined);- await getDevtoolsComments.handler({params: {}, page}, response, context);+ await getDevtoolsComments(args).handler(+ {params: {}, page},+ response,+ context,+ );sinon.assert.calledOnce(page.getDevToolsPage);sinon.assert.calledOnceWithExactly(@@ -50,7 +54,7 @@ describe('comments tools', () => {});it('fetches comments and sets them on response', async () => {- const {page, context, response} = createHandlerMocks();+ const {page, context, response, args} = createHandlerMocks();const devtoolsPage = createMockPuppeteerPage();page.getDevToolsPage.resolves(devtoolsPage);@@ -67,7 +71,11 @@ describe('comments tools', () => {devtoolsPage.evaluate.resolves([mockThread]);- await getDevtoolsComments.handler({params: {}, page}, response, context);+ await getDevtoolsComments(args).handler(+ {params: {}, page},+ response,+ context,+ );sinon.assert.calledOnce(page.getDevToolsPage);sinon.assert.calledOnce(devtoolsPage.evaluate);@@ -77,12 +85,16 @@ describe('comments tools', () => {});it('sets empty comments list when no comments are found', async () => {- const {page, context, response} = createHandlerMocks();+ const {page, context, response, args} = createHandlerMocks();const devtoolsPage = createMockPuppeteerPage();page.getDevToolsPage.resolves(devtoolsPage);devtoolsPage.evaluate.resolves([]);- await getDevtoolsComments.handler({params: {}, page}, response, context);+ await getDevtoolsComments(args).handler(+ {params: {}, page},+ response,+ context,+ );sinon.assert.calledOnce(page.getDevToolsPage);sinon.assert.calledOnce(devtoolsPage.evaluate);@@ -92,11 +104,11 @@ describe('comments tools', () => {describe('resolve_devtools_comment', () => {it('reports error when DevTools window is not open', async t => {- const {page, context, response} = createHandlerMocks();+ const {page, context, response, args} = createHandlerMocks();const lines = trackResponseLines(response);page.getDevToolsPage.resolves(undefined);- await resolveDevtoolsComment.handler(+ await resolveDevtoolsComment(args).handler({params: {threadId: 'comment-1'}, page},response,context,@@ -107,13 +119,13 @@ describe('comments tools', () => {});it('resolves comment thread and appends reply text', async t => {- const {page, context, response} = createHandlerMocks();+ const {page, context, response, args} = createHandlerMocks();const lines = trackResponseLines(response);const devtoolsPage = createMockPuppeteerPage();page.getDevToolsPage.resolves(devtoolsPage);devtoolsPage.evaluate.resolves(true);- await resolveDevtoolsComment.handler(+ await resolveDevtoolsComment(args).handler({params: {threadId: 'comment-1',@@ -130,13 +142,13 @@ describe('comments tools', () => {});it('reports error when thread is not found', async t => {- const {page, context, response} = createHandlerMocks();+ const {page, context, response, args} = createHandlerMocks();const lines = trackResponseLines(response);const devtoolsPage = createMockPuppeteerPage();page.getDevToolsPage.resolves(devtoolsPage);devtoolsPage.evaluate.resolves(false);- await resolveDevtoolsComment.handler(+ await resolveDevtoolsComment(args).handler({params: {threadId: 'comment-nonexistent'}, page},response,context,@@ -149,11 +161,11 @@ describe('comments tools', () => {describe('reveal_in_devtools', () => {it('reports error when DevTools window is not open', async t => {- const {page, context, response} = createHandlerMocks();+ const {page, context, response, args} = createHandlerMocks();const lines = trackResponseLines(response);page.getDevToolsPage.resolves(undefined);- await revealInDevtools.handler(+ await revealInDevtools(args).handler({params: {panelName: 'elements'}, page},response,context,@@ -164,7 +176,7 @@ describe('comments tools', () => {});it('reveals element by snapshot uid', async t => {- const {page, context, response} = createHandlerMocks();+ const {page, context, response, args} = createHandlerMocks();const lines = trackResponseLines(response);const devtoolsPage = createMockPuppeteerPage();page.getDevToolsPage.resolves(devtoolsPage);@@ -174,7 +186,7 @@ describe('comments tools', () => {});devtoolsPage.evaluate.resolves(undefined);- await revealInDevtools.handler(+ await revealInDevtools(args).handler({params: {panelName: 'elements',@@ -195,14 +207,14 @@ describe('comments tools', () => {});it('reveals network request by reqid', async t => {- const {page, context, response} = createHandlerMocks();+ const {page, context, response, args} = createHandlerMocks();const lines = trackResponseLines(response);const devtoolsPage = createMockPuppeteerPage();page.getDevToolsPage.resolves(devtoolsPage);page.resolveReqidToCdpRequestId.returns('cdp-req-123');devtoolsPage.evaluate.resolves(undefined);- await revealInDevtools.handler(+ await revealInDevtools(args).handler({params: {panelName: 'network',@@ -220,7 +232,7 @@ describe('comments tools', () => {});it('warns when snapshot uid or reqid cannot be resolved', async t => {- const {page, context, response} = createHandlerMocks();+ const {page, context, response, args} = createHandlerMocks();const lines = trackResponseLines(response);const devtoolsPage = createMockPuppeteerPage();page.getDevToolsPage.resolves(devtoolsPage);@@ -228,7 +240,7 @@ describe('comments tools', () => {page.resolveReqidToCdpRequestId.returns(undefined);devtoolsPage.evaluate.resolves(undefined);- await revealInDevtools.handler(+ await revealInDevtools(args).handler({params: {panelName: 'elements',@@ -245,7 +257,7 @@ describe('comments tools', () => {});it('reveals element when panelName is omitted', async () => {- const {page, context, response} = createHandlerMocks();+ const {page, context, response, args} = createHandlerMocks();const devtoolsPage = createMockPuppeteerPage();page.getDevToolsPage.resolves(devtoolsPage);page.resolveUidToBackendNodeId.resolves({@@ -254,7 +266,7 @@ describe('comments tools', () => {});devtoolsPage.evaluate.resolves(undefined);- await revealInDevtools.handler(+ await revealInDevtools(args).handler({params: {uid: 'uid-header',@@ -279,11 +291,11 @@ describe('comments tools', () => {describe('open_devtools', () => {it('opens DevTools window successfully', async () => {- const {page, context, response} = createHandlerMocks();+ const {page, context, response, args} = createHandlerMocks();const devtoolsPage = createMockPuppeteerPage();page.openDevTools.resolves(devtoolsPage);- await openDevtools.handler({params: {}, page}, response, context);+ await openDevtools(args).handler({params: {}, page}, response, context);sinon.assert.calledOnce(page.openDevTools);sinon.assert.calledOnceWithExactly(@@ -294,10 +306,10 @@ describe('comments tools', () => {});it('reports failure when openDevTools throws', async () => {- const {page, context, response} = createHandlerMocks();+ const {page, context, response, args} = createHandlerMocks();page.openDevTools.rejects(new Error('Connection closed'));- await openDevtools.handler({params: {}, page}, response, context);+ await openDevtools(args).handler({params: {}, page}, response, context);sinon.assert.calledOnce(page.openDevTools);sinon.assert.calledOnceWithExactly(diff --git a/tests/tools/console.test.ts b/tests/tools/console.test.tsindex 1376ebf2..705d30fb 100644--- a/tests/tools/console.test.ts+++ b/tests/tools/console.test.ts@@ -44,8 +44,8 @@ describe('console', () => {it('captures logs and errors from extension service worker', async t => {await withMcpContext(- async (response, context) => {- await installExtension.handler(+ async (response, context, args) => {+ await installExtension(args).handler({params: {path: EXTENSION_LOGGING_PATH}},response,context,@@ -62,7 +62,7 @@ describe('console', () => {const sw = swList.find(s => s.target === swTarget);assert(sw, 'Service worker not found in context list');- const response2 = new McpResponse({} as ParsedArguments);+ const response2 = new McpResponse(args);await context.triggerExtensionAction(extensionId);const worker = await swTarget.worker();@@ -98,9 +98,7 @@ describe('console', () => {await errorPromise;response2.resetResponseLineForTesting();- await listConsoleMessages({- categoryExtensions: true,- } as ParsedArguments).handler(+ await listConsoleMessages(args).handler({params: {serviceWorkerId: extensionId},page: context.getSelectedMcpPage(),@@ -145,8 +143,8 @@ describe('console', () => {describe('list_console_messages', () => {it('list messages', async () => {- await withMcpContext(async (response, context) => {- await listConsoleMessages().handler(+ await withMcpContext(async (response, context, args) => {+ await listConsoleMessages(args).handler({params: {}, page: context.getSelectedMcpPage()},response,context,@@ -156,12 +154,12 @@ describe('console', () => {});it('lists error messages', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage();await page.pptrPage.setContent('<script>console.error("This is an error")</script>',);- await listConsoleMessages().handler(+ await listConsoleMessages(args).handler({params: {}, page: context.getSelectedMcpPage()},response,context,@@ -173,12 +171,12 @@ describe('console', () => {});it('lists error objects', async t => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage();await page.pptrPage.setContent('<script>console.error(new Error("This is an error"))</script>',);- await listConsoleMessages().handler(+ await listConsoleMessages(args).handler({params: {}, page: context.getSelectedMcpPage()},response,context,@@ -190,12 +188,12 @@ describe('console', () => {});it('includes stack traces when includeStackTraces is set', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage();await page.pptrPage.setContent('<script>function failingFn() { console.error("This is an error"); } failingFn();</script>',);- await listConsoleMessages().handler(+ await listConsoleMessages(args).handler({params: {includeStackTraces: true},page: context.getSelectedMcpPage(),@@ -218,12 +216,12 @@ describe('console', () => {});it('omits stack traces by default', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage();await page.pptrPage.setContent('<script>function failingFn() { console.error("This is an error"); } failingFn();</script>',);- await listConsoleMessages().handler(+ await listConsoleMessages(args).handler({params: {}, page: context.getSelectedMcpPage()},response,context,@@ -243,10 +241,10 @@ describe('console', () => {});it('work with primitive unhandled errors', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage();await page.pptrPage.setContent('<script>throw undefined;</script>');- await listConsoleMessages().handler(+ await listConsoleMessages(args).handler({params: {}, page: context.getSelectedMcpPage()},response,context,@@ -259,7 +257,7 @@ describe('console', () => {describe('issues', () => {it('lists issues', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage();const issuePromise = new Promise<void>(resolve => {page.pptrPage.once('issue', () => {@@ -270,7 +268,7 @@ describe('console', () => {'<input type="text" name="username" />',);await issuePromise;- await listConsoleMessages().handler(+ await listConsoleMessages(args).handler({params: {}, page: context.getSelectedMcpPage()},response,context,@@ -286,7 +284,7 @@ describe('console', () => {});it('lists issues after a page reload', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = await context.newPage();response.setPage(page);const issuePromise = new Promise<void>(resolve => {@@ -299,7 +297,7 @@ describe('console', () => {'<input type="text" name="username" />',);await issuePromise;- await listConsoleMessages().handler(+ await listConsoleMessages(args).handler({params: {}, page: context.getSelectedMcpPage()},response,context,@@ -337,7 +335,7 @@ describe('console', () => {});it('when dialog is open', async t => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent('<script>console.log("Pre-dialog message")</script>',@@ -357,7 +355,7 @@ describe('console', () => {const dialog = await dialogPromise;try {- await listConsoleMessages().handler(+ await listConsoleMessages(args).handler({params: {}, page: context.getSelectedMcpPage()},response,context,@@ -378,18 +376,18 @@ describe('console', () => {const server = serverHooks();it('gets a specific console message', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage();await page.pptrPage.setContent('<script>console.error("This is an error")</script>',);// The list is needed to populate the console messages in the context.- await listConsoleMessages().handler(+ await listConsoleMessages(args).handler({params: {}, page: context.getSelectedMcpPage()},response,context,);- await getConsoleMessage.handler(+ await getConsoleMessage(args).handler({params: {msgid: 1}, page: context.getSelectedMcpPage()},response,context,@@ -405,7 +403,7 @@ describe('console', () => {describe('issues type', () => {it('gets issue details with node id parsing', async t => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage();const issuePromise = new Promise<void>(resolve => {page.pptrPage.once('issue', () => {@@ -417,14 +415,14 @@ describe('console', () => {);page.textSnapshot = await TextSnapshot.create(page);await issuePromise;- await listConsoleMessages().handler(+ await listConsoleMessages(args).handler({params: {}, page: context.getSelectedMcpPage()},response,context,);- const response2 = new McpResponse({} as ParsedArguments);+ const response2 = new McpResponse(args);response2.setPage(context.getSelectedMcpPage());- await getConsoleMessage.handler(+ await getConsoleMessage(args).handler({params: {msgid: 1}, page: context.getSelectedMcpPage()},response2,context,@@ -440,7 +438,7 @@ describe('console', () => {res.end(JSON.stringify({data: 'test data'}));});- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage();const issuePromise = new Promise<void>(resolve => {page.pptrPage.once('issue', () => {@@ -473,14 +471,14 @@ describe('console', () => {assert.ok(issueMsg);const id = response.getConsoleMessageStableId(issueMsg);assert.ok(id);- await listConsoleMessages().handler(+ await listConsoleMessages(args).handler({params: {types: ['issue']}, page: context.getSelectedMcpPage()},response,context,);- const response2 = new McpResponse({} as ParsedArguments);+ const response2 = new McpResponse(args);response2.setPage(context.getSelectedMcpPage());- await getConsoleMessage.handler(+ await getConsoleMessage(args).handler({params: {msgid: id}, page: context.getSelectedMcpPage()},response2,context,@@ -511,11 +509,11 @@ describe('console', () => {`<script src="${server.getRoute('/main.min.js')}"></script>`,);- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage();await page.pptrPage.goto(server.getRoute('/index.html'));- await getConsoleMessage.handler(+ await getConsoleMessage(args).handler({params: {msgid: 1}, page: context.getSelectedMcpPage()},response,context,@@ -540,11 +538,11 @@ describe('console', () => {`<script src="${server.getRoute('/main.min.js')}"></script>`,);- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage();await page.pptrPage.goto(server.getRoute('/index.html'));- await getConsoleMessage.handler(+ await getConsoleMessage(args).handler({params: {msgid: 1}, page: context.getSelectedMcpPage()},response,context,@@ -569,11 +567,11 @@ describe('console', () => {`<script src="${server.getRoute('/main.min.js')}"></script>`,);- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage();await page.pptrPage.goto(server.getRoute('/index.html'));- await getConsoleMessage.handler(+ await getConsoleMessage(args).handler({params: {msgid: 1}, page: context.getSelectedMcpPage()},response,context,@@ -598,11 +596,11 @@ describe('console', () => {`<script src="${server.getRoute('/main.min.js')}"></script>`,);- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage();await page.pptrPage.goto(server.getRoute('/index.html'));- await getConsoleMessage.handler(+ await getConsoleMessage(args).handler({params: {msgid: 1}, page: context.getSelectedMcpPage()},response,context,@@ -627,11 +625,11 @@ describe('console', () => {`<script src="${server.getRoute('/main.min.js')}"></script>`,);- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage();await page.pptrPage.goto(server.getRoute('/index.html'));- await getConsoleMessage.handler(+ await getConsoleMessage(args).handler({params: {msgid: 1}, page: context.getSelectedMcpPage()},response,context,@@ -657,11 +655,11 @@ describe('console', () => {);await withMcpContext(- async (response, context) => {+ async (response, context, args) => {const page = context.getSelectedMcpPage();await page.pptrPage.goto(server.getRoute('/index.html'));- await getConsoleMessage.handler(+ await getConsoleMessage(args).handler({params: {msgid: 1}, page: context.getSelectedMcpPage()},response,context,@@ -703,11 +701,11 @@ describe('console', () => {`,);- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage();await page.pptrPage.goto(server.getRoute('/index.html'));- await getConsoleMessage.handler(+ await getConsoleMessage(args).handler({params: {msgid: 1}, page: context.getSelectedMcpPage()},response,context,@@ -720,13 +718,13 @@ describe('console', () => {});it('when dialog is open', async t => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent('<script>console.error("This is an error")</script>',);- await listConsoleMessages().handler(+ await listConsoleMessages(args).handler({params: {}, page: context.getSelectedMcpPage()},response,context,@@ -745,7 +743,7 @@ describe('console', () => {const dialog = await dialogPromise;try {- await getConsoleMessage.handler(+ await getConsoleMessage(args).handler({params: {msgid: 1}, page: context.getSelectedMcpPage()},response,context,diff --git a/tests/tools/css.test.ts b/tests/tools/css.test.tsindex e92bd645..11cc121a 100644--- a/tests/tools/css.test.ts+++ b/tests/tools/css.test.ts@@ -18,13 +18,13 @@ describe('get_css_styles', () => {});it('retrieves matched styles for a uid and passes to response', async () => {- const {page, context, response} = createHandlerMocks();+ const {page, context, response, args} = createHandlerMocks();const mockStyles = sinon.createStubInstance(DevTools.CSSMatchedStyles.CSSMatchedStyles,);page.getMatchedStylesForUid.resolves(mockStyles);- await getCssStyles.handler(+ await getCssStyles(args).handler({params: {uid: 'element-1'}, page},response,context,@@ -46,13 +46,13 @@ describe('get_css_styles', () => {});it('passes pagination options to response', async () => {- const {page, context, response} = createHandlerMocks();+ const {page, context, response, args} = createHandlerMocks();const mockStyles = sinon.createStubInstance(DevTools.CSSMatchedStyles.CSSMatchedStyles,);page.getMatchedStylesForUid.resolves(mockStyles);- await getCssStyles.handler(+ await getCssStyles(args).handler({params: {uid: 'element-1', pageSize: 10, pageIdx: 2}, page},response,context,diff --git a/tests/tools/emulation.test.ts b/tests/tools/emulation.test.tsindex d9002242..e9387459 100644--- a/tests/tools/emulation.test.ts+++ b/tests/tools/emulation.test.ts@@ -124,8 +124,8 @@ describe('emulation', () => {describe('network', () => {it('emulates offline network conditions', async () => {- const {page, context, response} = createHandlerMocks();- await emulate.handler(+ const {page, context, response, args} = createHandlerMocks();+ await emulate(args).handler({params: {networkConditions: 'Offline'}, page},response,context,@@ -140,8 +140,8 @@ describe('emulation', () => {});it('emulates network throttling when the throttling option is valid', async () => {- const {page, context, response} = createHandlerMocks();- await emulate.handler(+ const {page, context, response, args} = createHandlerMocks();+ await emulate(args).handler({params: {networkConditions: 'Slow 3G'}, page},response,context,@@ -152,14 +152,14 @@ describe('emulation', () => {});it('disables network emulation when networkConditions is omitted', async () => {- const {page, context, response} = createHandlerMocks();- await emulate.handler({params: {}, page}, response, context);+ const {page, context, response, args} = createHandlerMocks();+ await emulate(args).handler({params: {}, page}, response, context);sinon.assert.calledOnceWithExactly(page.emulate, {});});it('report correctly for the currently selected page', async () => {- const {page, context, response} = createHandlerMocks();- await emulate.handler(+ const {page, context, response, args} = createHandlerMocks();+ await emulate(args).handler({params: {networkConditions: 'Slow 3G'}, page},response,context,@@ -172,8 +172,8 @@ describe('emulation', () => {describe('cpu', () => {it('emulates cpu throttling when the rate is valid (1-20x)', async () => {- const {page, context, response} = createHandlerMocks();- await emulate.handler(+ const {page, context, response, args} = createHandlerMocks();+ await emulate(args).handler({params: {cpuThrottlingRate: 4}, page},response,context,@@ -186,8 +186,8 @@ describe('emulation', () => {});it('disables cpu throttling when rate is 1', async () => {- const {page, context, response} = createHandlerMocks();- await emulate.handler(+ const {page, context, response, args} = createHandlerMocks();+ await emulate(args).handler({params: {cpuThrottlingRate: 1}, page},response,context,@@ -196,8 +196,8 @@ describe('emulation', () => {});it('report correctly for the currently selected page', async () => {- const {page, context, response} = createHandlerMocks();- await emulate.handler(+ const {page, context, response, args} = createHandlerMocks();+ await emulate(args).handler({params: {cpuThrottlingRate: 4}, page},response,context,@@ -208,8 +208,8 @@ describe('emulation', () => {describe('geolocation', () => {it('emulates geolocation with latitude and longitude', async () => {- const {page, context, response} = createHandlerMocks();- await emulate.handler(+ const {page, context, response, args} = createHandlerMocks();+ await emulate(args).handler({params: {geolocation: {@@ -235,8 +235,8 @@ describe('emulation', () => {});it('clears geolocation override when geolocation is omitted', async () => {- const {page, context, response} = createHandlerMocks();- await emulate.handler(+ const {page, context, response, args} = createHandlerMocks();+ await emulate(args).handler({params: {},page,@@ -248,8 +248,8 @@ describe('emulation', () => {});it('reports correctly for the currently selected page', async () => {- const {page, context, response} = createHandlerMocks();- await emulate.handler(+ const {page, context, response, args} = createHandlerMocks();+ await emulate(args).handler({params: {geolocation: {@@ -273,8 +273,8 @@ describe('emulation', () => {describe('viewport', () => {it('emulates viewport', async () => {- const {page, context, response} = createHandlerMocks();- await emulate.handler(+ const {page, context, response, args} = createHandlerMocks();+ await emulate(args).handler({params: {viewport: {@@ -308,8 +308,8 @@ describe('emulation', () => {});it('clears viewport override when viewport is omitted', async () => {- const {page, context, response} = createHandlerMocks();- await emulate.handler(+ const {page, context, response, args} = createHandlerMocks();+ await emulate(args).handler({params: {},page,@@ -321,8 +321,8 @@ describe('emulation', () => {});it('reports correctly for the currently selected page', async () => {- const {page, context, response} = createHandlerMocks();- await emulate.handler(+ const {page, context, response, args} = createHandlerMocks();+ await emulate(args).handler({params: {viewport: {@@ -346,8 +346,8 @@ describe('emulation', () => {describe('userAgent', () => {it('emulates userAgent', async () => {- const {page, context, response} = createHandlerMocks();- await emulate.handler(+ const {page, context, response, args} = createHandlerMocks();+ await emulate(args).handler({params: {userAgent: 'MyUA',@@ -367,8 +367,8 @@ describe('emulation', () => {});it('updates userAgent', async () => {- const {page, context, response} = createHandlerMocks();- await emulate.handler(+ const {page, context, response, args} = createHandlerMocks();+ await emulate(args).handler({params: {userAgent: 'UA1',@@ -382,7 +382,7 @@ describe('emulation', () => {userAgent: 'UA1',});- await emulate.handler(+ await emulate(args).handler({params: {userAgent: 'UA2',@@ -399,8 +399,8 @@ describe('emulation', () => {});it('clears userAgent override when userAgent is omitted', async () => {- const {page, context, response} = createHandlerMocks();- await emulate.handler(+ const {page, context, response, args} = createHandlerMocks();+ await emulate(args).handler({params: {},page,@@ -412,8 +412,8 @@ describe('emulation', () => {});it('reports correctly for the currently selected page', async () => {- const {page, context, response} = createHandlerMocks();- await emulate.handler(+ const {page, context, response, args} = createHandlerMocks();+ await emulate(args).handler({params: {userAgent: 'MyUA',@@ -431,8 +431,8 @@ describe('emulation', () => {describe('extraHttpHeaders', () => {it('emulates extraHttpHeaders', async () => {- const {page, context, response} = createHandlerMocks();- await emulate.handler(+ const {page, context, response, args} = createHandlerMocks();+ await emulate(args).handler({params: {extraHttpHeaders: {'X-Custom-Header': 'test-value'},@@ -452,8 +452,8 @@ describe('emulation', () => {});it('clears extra headers when empty object is passed', async () => {- const {page, context, response} = createHandlerMocks();- await emulate.handler(+ const {page, context, response, args} = createHandlerMocks();+ await emulate(args).handler({params: {extraHttpHeaders: {},@@ -469,8 +469,8 @@ describe('emulation', () => {});it('reports correctly for the currently selected page', async () => {- const {page, context, response} = createHandlerMocks();- await emulate.handler(+ const {page, context, response, args} = createHandlerMocks();+ await emulate(args).handler({params: {extraHttpHeaders: {'X-Page': 'one'},@@ -488,8 +488,8 @@ describe('emulation', () => {describe('colorScheme', () => {it('emulates color scheme', async () => {- const {page, context, response} = createHandlerMocks();- await emulate.handler(+ const {page, context, response, args} = createHandlerMocks();+ await emulate(args).handler({params: {colorScheme: 'dark',@@ -509,8 +509,8 @@ describe('emulation', () => {});it('updates color scheme', async () => {- const {page, context, response} = createHandlerMocks();- await emulate.handler(+ const {page, context, response, args} = createHandlerMocks();+ await emulate(args).handler({params: {colorScheme: 'dark',@@ -524,7 +524,7 @@ describe('emulation', () => {colorScheme: 'dark',});- await emulate.handler(+ await emulate(args).handler({params: {colorScheme: 'light',@@ -541,8 +541,8 @@ describe('emulation', () => {});it('resets color scheme when set to auto', async () => {- const {page, context, response} = createHandlerMocks();- await emulate.handler(+ const {page, context, response, args} = createHandlerMocks();+ await emulate(args).handler({params: {colorScheme: 'auto',diff --git a/tests/tools/extensions.test.ts b/tests/tools/extensions.test.tsindex 71650ca3..cbca5d0a 100644--- a/tests/tools/extensions.test.ts+++ b/tests/tools/extensions.test.ts@@ -25,10 +25,10 @@ describe('extensions', () => {describe('install_extension', () => {it('installs an extension and appends response line', async () => {- const {context, response} = createHandlerMocks();+ const {context, response, args} = createHandlerMocks();context.installExtension.resolves('ext-123');- await installExtension.handler(+ await installExtension(args).handler({params: {path: '/path/to/extension'}},response,context,@@ -47,10 +47,10 @@ describe('extensions', () => {describe('uninstall_extension', () => {it('uninstalls an extension and appends response line', async () => {- const {context, response} = createHandlerMocks();+ const {context, response, args} = createHandlerMocks();context.uninstallExtension.resolves();- await uninstallExtension.handler(+ await uninstallExtension(args).handler({params: {id: 'ext-123'}},response,context,@@ -66,9 +66,9 @@ describe('extensions', () => {describe('list_extensions', () => {it('sets list extensions on response', async () => {- const {context, response} = createHandlerMocks();+ const {context, response, args} = createHandlerMocks();- await listExtensions.handler({params: {}}, response, context);+ await listExtensions(args).handler({params: {}}, response, context);sinon.assert.calledOnceWithExactly(response.setListExtensions);});@@ -76,7 +76,7 @@ describe('extensions', () => {describe('reload_extension', () => {it('reloads an extension by reinstalling its path', async () => {- const {context, response} = createHandlerMocks();+ const {context, response, args} = createHandlerMocks();const mockExtension = createMockExtension({id: 'ext-123',path: '/path/to/extension',@@ -84,7 +84,7 @@ describe('extensions', () => {context.getExtension.resolves(mockExtension);context.installExtension.resolves('ext-123');- await reloadExtension.handler(+ await reloadExtension(args).handler({params: {id: 'ext-123'}},response,context,@@ -102,12 +102,12 @@ describe('extensions', () => {});it('throws when extension is not found', async () => {- const {context, response} = createHandlerMocks();+ const {context, response, args} = createHandlerMocks();context.getExtension.resolves(undefined);await assert.rejects(async () => {- await reloadExtension.handler(+ await reloadExtension(args).handler({params: {id: 'non-existent'}},response,context,@@ -124,10 +124,10 @@ describe('extensions', () => {describe('trigger_extension_action', () => {it('triggers extension action and appends response line', async () => {- const {context, response} = createHandlerMocks();+ const {context, response, args} = createHandlerMocks();context.triggerExtensionAction.resolves();- await triggerExtensionAction.handler(+ await triggerExtensionAction(args).handler({params: {id: 'ext-123'}},response,context,diff --git a/tests/tools/input.test.ts b/tests/tools/input.test.tsindex 7e46cd62..769fd019 100644--- a/tests/tools/input.test.ts+++ b/tests/tools/input.test.ts@@ -11,7 +11,6 @@ import {describe, it} from 'node:test';import sinon from 'sinon';-import type {ParsedArguments} from '../../src/config/mcp-options.js';import {McpResponse} from '../../src/McpResponse.js';import {TextSnapshot} from '../../src/TextSnapshot.js';import {@@ -33,7 +32,7 @@ describe('input', () => {describe('click', () => {it('clicks', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<button onclick="this.innerText = 'clicked';">test</button>`,@@ -41,7 +40,7 @@ describe('input', () => {context.getSelectedMcpPage().textSnapshot = await TextSnapshot.create(context.getSelectedMcpPage(),);- await click.handler(+ await click(args).handler({params: {uid: '1_1',@@ -60,7 +59,7 @@ describe('input', () => {});});it('double clicks', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<button ondblclick="this.innerText = 'dblclicked';"@@ -70,7 +69,7 @@ describe('input', () => {context.getSelectedMcpPage().textSnapshot = await TextSnapshot.create(context.getSelectedMcpPage(),);- await click.handler(+ await click(args).handler({params: {uid: '1_1',@@ -101,13 +100,13 @@ describe('input', () => {res.end();});- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.goto(server.getRoute('/link'));context.getSelectedMcpPage().textSnapshot = await TextSnapshot.create(context.getSelectedMcpPage(),);- const clickPromise = click.handler(+ const clickPromise = click(args).handler({params: {uid: '1_1',@@ -138,13 +137,13 @@ describe('input', () => {);server.addHtmlRoute('/after-click', html`<main>arrived</main>`);- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.goto(server.getRoute('/start'));context.getSelectedMcpPage().textSnapshot = await TextSnapshot.create(context.getSelectedMcpPage(),);- await click.handler(+ await click(args).handler({params: {uid: '1_2',@@ -165,7 +164,7 @@ describe('input', () => {});it('does not report navigation when click does not navigate', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<button onclick="this.innerText = 'clicked';">test</button>`,@@ -173,7 +172,7 @@ describe('input', () => {context.getSelectedMcpPage().textSnapshot = await TextSnapshot.create(context.getSelectedMcpPage(),);- await click.handler(+ await click(args).handler({params: {uid: '1_1',@@ -207,13 +206,13 @@ describe('input', () => {</script>`,);- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.goto(server.getRoute('/unstable'));context.getSelectedMcpPage().textSnapshot = await TextSnapshot.create(context.getSelectedMcpPage(),);- const handlerResolveTime = await click+ const handlerResolveTime = await click(args).handler({params: {@@ -235,7 +234,7 @@ describe('input', () => {});it('does not include snapshot by default', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<button onclick="this.innerText = 'clicked';">test</button>`,@@ -243,7 +242,7 @@ describe('input', () => {context.getSelectedMcpPage().textSnapshot = await TextSnapshot.create(context.getSelectedMcpPage(),);- await click.handler(+ await click(args).handler({params: {uid: '1_1',@@ -262,7 +261,7 @@ describe('input', () => {});it('includes snapshot if includeSnapshot is true', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<button onclick="this.innerText = 'clicked';">test</button>`,@@ -270,7 +269,7 @@ describe('input', () => {context.getSelectedMcpPage().textSnapshot = await TextSnapshot.create(context.getSelectedMcpPage(),);- await click.handler(+ await click(args).handler({params: {uid: '1_1',@@ -290,7 +289,7 @@ describe('input', () => {});it('selects a collapsed native select option by option uid', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<select onchange="document.body.dataset.selected = this.value">@@ -305,7 +304,7 @@ describe('input', () => {);assert.ok(optionNode);- await click.handler(+ await click(args).handler({params: {uid: optionNode.id,@@ -337,7 +336,7 @@ describe('input', () => {});it('selects a collapsed native optgroup option by option uid', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<select onchange="document.body.dataset.selected = this.value">@@ -354,7 +353,7 @@ describe('input', () => {);assert.ok(optionNode);- await click.handler(+ await click(args).handler({params: {uid: optionNode.id,@@ -386,7 +385,7 @@ describe('input', () => {});it('clicks custom ARIA option elements through the normal click path', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<div role="listbox">@@ -406,7 +405,7 @@ describe('input', () => {);assert.ok(optionNode);- await click.handler(+ await click(args).handler({params: {uid: optionNode.id,@@ -431,7 +430,7 @@ describe('input', () => {describe('hover', () => {it('hovers', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<button onmouseover="this.innerText = 'hovered';">test</button>`,@@ -439,7 +438,7 @@ describe('input', () => {context.getSelectedMcpPage().textSnapshot = await TextSnapshot.create(context.getSelectedMcpPage(),);- await hover.handler(+ await hover(args).handler({params: {uid: '1_1',@@ -461,7 +460,7 @@ describe('input', () => {describe('click_at', () => {it('clicks at coordinates', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<div@@ -472,7 +471,7 @@ describe('input', () => {context.getSelectedMcpPage().textSnapshot = await TextSnapshot.create(context.getSelectedMcpPage(),);- await clickAt.handler(+ await clickAt(args).handler({params: {x: 50,@@ -493,7 +492,7 @@ describe('input', () => {});it('double clicks at coordinates', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<div@@ -504,7 +503,7 @@ describe('input', () => {context.getSelectedMcpPage().textSnapshot = await TextSnapshot.create(context.getSelectedMcpPage(),);- await clickAt.handler(+ await clickAt(args).handler({params: {x: 50,@@ -528,13 +527,13 @@ describe('input', () => {describe('fill', () => {it('fills out an input', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<input />`);context.getSelectedMcpPage().textSnapshot = await TextSnapshot.create(context.getSelectedMcpPage(),);- await fill.handler(+ await fill(args).handler({params: {uid: '1_1',@@ -555,7 +554,7 @@ describe('input', () => {});it('fills out a select by text', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<select@@ -566,7 +565,7 @@ describe('input', () => {context.getSelectedMcpPage().textSnapshot = await TextSnapshot.create(context.getSelectedMcpPage(),);- await fill.handler(+ await fill(args).handler({params: {uid: '1_1',@@ -590,7 +589,7 @@ describe('input', () => {});it('fills out a select option with an empty value by text', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<select@@ -605,7 +604,7 @@ describe('input', () => {context.getSelectedMcpPage().textSnapshot = await TextSnapshot.create(context.getSelectedMcpPage(),);- await fill.handler(+ await fill(args).handler({params: {uid: '1_1',@@ -628,13 +627,13 @@ describe('input', () => {});it('fills out a textarea marked as combobox', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<textarea role="combobox"></textarea>`);context.getSelectedMcpPage().textSnapshot = await TextSnapshot.create(context.getSelectedMcpPage(),);- await fill.handler(+ await fill(args).handler({params: {uid: '1_1',@@ -659,14 +658,14 @@ describe('input', () => {});it('fills out a textarea with long text', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<textarea></textarea>`);context.getSelectedMcpPage().textSnapshot = await TextSnapshot.create(context.getSelectedMcpPage(),);page.setDefaultTimeout(1000);- await fill.handler(+ await fill(args).handler({params: {uid: '1_1',@@ -693,14 +692,14 @@ describe('input', () => {});it('types text', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<textarea></textarea>`);await page.click('textarea');context.getSelectedMcpPage().textSnapshot = await TextSnapshot.create(context.getSelectedMcpPage(),);- await typeText.handler(+ await typeText(args).handler({params: {text: 'test',@@ -721,14 +720,14 @@ describe('input', () => {});it('types text with submit key', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<textarea></textarea>`);await page.click('textarea');context.getSelectedMcpPage().textSnapshot = await TextSnapshot.create(context.getSelectedMcpPage(),);- await typeText.handler(+ await typeText(args).handler({params: {text: 'test',@@ -760,7 +759,7 @@ describe('input', () => {});it('errors on invalid submit key', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<textarea></textarea>`);await page.click('textarea');@@ -768,7 +767,7 @@ describe('input', () => {context.getSelectedMcpPage(),);try {- await typeText.handler(+ await typeText(args).handler({params: {text: 'test',@@ -786,7 +785,7 @@ describe('input', () => {});it('reproduction: fill isolation', async () => {- await withMcpContext(async (_response, context) => {+ await withMcpContext(async (_response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<form>@@ -805,8 +804,8 @@ describe('input', () => {);// Fill email- const response1 = new McpResponse({} as ParsedArguments);- await fill.handler(+ const response1 = new McpResponse(args);+ await fill(args).handler({params: {uid: '1_2', // email input@@ -823,8 +822,8 @@ describe('input', () => {);// Fill password- const response2 = new McpResponse({} as ParsedArguments);- await fill.handler(+ const response2 = new McpResponse(args);+ await fill(args).handler({params: {uid: '1_3', // password input@@ -863,7 +862,7 @@ describe('input', () => {});it('toggles checkboxes', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<input@@ -876,7 +875,7 @@ describe('input', () => {);// Check it- await fill.handler(+ await fill(args).handler({params: {uid: '1_1',@@ -900,7 +899,7 @@ describe('input', () => {assert.strictEqual(isChecked, true);// Uncheck it- await fill.handler(+ await fill(args).handler({params: {uid: '1_1',@@ -908,7 +907,7 @@ describe('input', () => {},page: context.getSelectedMcpPage(),},- new McpResponse({} as ParsedArguments),+ new McpResponse(args),context,);@@ -921,7 +920,7 @@ describe('input', () => {});it('toggles switches', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<div@@ -939,7 +938,7 @@ describe('input', () => {);// Turn it on- await fill.handler(+ await fill(args).handler({params: {uid: '1_1',@@ -958,7 +957,7 @@ describe('input', () => {assert.strictEqual(swChecked, true);// Turn it off- await fill.handler(+ await fill(args).handler({params: {uid: '1_1',@@ -966,7 +965,7 @@ describe('input', () => {},page: context.getSelectedMcpPage(),},- new McpResponse({} as ParsedArguments),+ new McpResponse(args),context,);@@ -979,7 +978,7 @@ describe('input', () => {});it('selects radio buttons', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<input@@ -1011,7 +1010,7 @@ describe('input', () => {assert.strictEqual(r2Checked, false);// Fill second radio with true- await fill.handler(+ await fill(args).handler({params: {uid: '1_2',@@ -1039,7 +1038,7 @@ describe('input', () => {describe('drags', () => {it('drags one element onto another', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<div@@ -1073,7 +1072,7 @@ describe('input', () => {context.getSelectedMcpPage().textSnapshot = await TextSnapshot.create(context.getSelectedMcpPage(),);- await drag.handler(+ await drag(args).handler({params: {from_uid: '1_1',@@ -1096,7 +1095,7 @@ describe('input', () => {describe('fill form', () => {it('successfully fills out the form', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<form>@@ -1119,7 +1118,7 @@ describe('input', () => {context.getSelectedMcpPage().textSnapshot = await TextSnapshot.create(context.getSelectedMcpPage(),);- await fillForm.handler(+ await fillForm(args).handler({params: {elements: [@@ -1158,7 +1157,7 @@ describe('input', () => {});it('fill_form handles checkboxes', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<input@@ -1172,7 +1171,7 @@ describe('input', () => {context.getSelectedMcpPage().textSnapshot = await TextSnapshot.create(context.getSelectedMcpPage(),);- await fillForm.handler(+ await fillForm(args).handler({params: {elements: [@@ -1214,7 +1213,7 @@ describe('input', () => {const testFilePath = path.join(process.cwd(), 'test.txt');await fs.writeFile(testFilePath, 'test file content');- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<form>@@ -1227,7 +1226,7 @@ describe('input', () => {context.getSelectedMcpPage().textSnapshot = await TextSnapshot.create(context.getSelectedMcpPage(),);- await uploadFile.handler(+ await uploadFile(args).handler({params: {uid: '1_2',@@ -1254,7 +1253,7 @@ describe('input', () => {await fs.writeFile(firstFilePath, 'first file content');await fs.writeFile(secondFilePath, 'second file content');- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<form>@@ -1268,7 +1267,7 @@ describe('input', () => {context.getSelectedMcpPage().textSnapshot = await TextSnapshot.create(context.getSelectedMcpPage(),);- await uploadFile.handler(+ await uploadFile(args).handler({params: {uid: '1_2',@@ -1298,7 +1297,7 @@ describe('input', () => {const testFilePath = path.join(process.cwd(), 'test.txt');await fs.writeFile(testFilePath, 'test file content');- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<button id="file-chooser-button">Upload file</button>@@ -1318,7 +1317,7 @@ describe('input', () => {context.getSelectedMcpPage().textSnapshot = await TextSnapshot.create(context.getSelectedMcpPage(),);- await uploadFile.handler(+ await uploadFile(args).handler({params: {uid: '1_1',@@ -1348,7 +1347,7 @@ describe('input', () => {const testFilePath = path.join(process.cwd(), 'test.txt');await fs.writeFile(testFilePath, 'test file content');- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<div>Not a file input</div>`);context.getSelectedMcpPage().textSnapshot = await TextSnapshot.create(@@ -1356,7 +1355,7 @@ describe('input', () => {);await assert.rejects(- uploadFile.handler(+ uploadFile(args).handler({params: {uid: '1_1',@@ -1383,7 +1382,7 @@ describe('input', () => {describe('press_key', () => {it('processes press_key', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<script>@@ -1396,7 +1395,7 @@ describe('input', () => {context.getSelectedMcpPage(),);- await pressKey.handler(+ await pressKey(args).handler({params: {key: 'Control+Shift+C',@@ -1419,7 +1418,7 @@ describe('input', () => {});it('releases held modifiers when the main key press fails', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<script>@@ -1440,7 +1439,7 @@ describe('input', () => {try {await assert.rejects(- pressKey.handler(+ pressKey(args).handler({params: {key: 'Control+Shift+C',diff --git a/tests/tools/lighthouse.test.ts b/tests/tools/lighthouse.test.tsindex 5a2edadc..45b436ff 100644--- a/tests/tools/lighthouse.test.ts+++ b/tests/tools/lighthouse.test.ts@@ -29,11 +29,11 @@ describe('lighthouse', () => {it('runs Lighthouse audit by default (navigation, desktop)', async () => {server.addHtmlRoute('/test', html`<div>Test</div>`);- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.goto(server.getRoute('/test'));- await lighthouseAudit.handler(+ await lighthouseAudit(args).handler({params: {mode: 'navigation',@@ -62,13 +62,13 @@ describe('lighthouse', () => {});it('restores emulation', async () => {- const {page, context, response} = createHandlerMocks();+ const {page, context, response, args} = createHandlerMocks();context.saveTemporaryFile.resolves({filepath: 'report.json'});sinon.stub(lighthouseRunner, 'snapshot').resolves(createMockRunnerResult());- await lighthouseAudit.handler(+ await lighthouseAudit(args).handler({params: {mode: 'snapshot',@@ -84,14 +84,14 @@ describe('lighthouse', () => {});it('restores emulation even when audit fails', async () => {- const {page, context, response} = createHandlerMocks();+ const {page, context, response, args} = createHandlerMocks();sinon.stub(lighthouseRunner, 'snapshot').rejects(new Error('Audit failed'));await assert.rejects(() =>- lighthouseAudit.handler(+ lighthouseAudit(args).handler({params: {mode: 'snapshot',@@ -111,11 +111,11 @@ describe('lighthouse', () => {it('runs Lighthouse in snapshot mode with mobile device', async () => {server.addHtmlRoute('/test-mobile', html`<div>Test Mobile</div>`);- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.goto(server.getRoute('/test-mobile'));- await lighthouseAudit.handler(+ await lighthouseAudit(args).handler({params: {mode: 'snapshot',@@ -146,11 +146,11 @@ describe('lighthouse', () => {);try {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.goto(server.getRoute('/test-mobile'));- await lighthouseAudit.handler(+ await lighthouseAudit(args).handler({params: {mode: 'snapshot',diff --git a/tests/tools/memory.test.ts b/tests/tools/memory.test.tsindex 299b32e8..b556170c 100644--- a/tests/tools/memory.test.ts+++ b/tests/tools/memory.test.ts@@ -54,10 +54,10 @@ describe('memory', () => {describe('take_heapsnapshot', () => {it('with default options', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const filePath = join(tmpdir(), 'test-screenshot.heapsnapshot');try {- await takeHeapSnapshot.handler(+ await takeHeapSnapshot(args).handler({params: {filePath}, page: context.getSelectedMcpPage()},response,context,@@ -75,11 +75,11 @@ describe('memory', () => {});it('delegates to ensureExtension, captureHeapSnapshot, and appends response line', async () => {- const {page, context, response} = createHandlerMocks();+ const {page, context, response, args} = createHandlerMocks();context.ensureExtension.resolves('/canonical/test.heapsnapshot');page.pptrPage.captureHeapSnapshot.resolves();- await takeHeapSnapshot.handler(+ await takeHeapSnapshot(args).handler({params: {filePath: 'test.heapsnapshot'}, page},response,context,@@ -102,7 +102,7 @@ describe('memory', () => {describe('get_heapsnapshot_summary', () => {it('fetches stats, static data, native context sizes, and retained summary', async () => {- const {context, response} = createHandlerMocks();+ const {context, response, args} = createHandlerMocks();const stats = createMockHeapSnapshotStats();const staticData = createMockHeapSnapshotStaticData();const nativeContextSizes = createMockNativeContextSizes();@@ -115,7 +115,7 @@ describe('memory', () => {retainedByContextSummary,);- await getHeapSnapshotSummary.handler(+ await getHeapSnapshotSummary(args).handler({params: {filePath: 'test.heapsnapshot'}},response,context,@@ -149,11 +149,11 @@ describe('memory', () => {describe('get_heapsnapshot_details', () => {it('with default options', async () => {- const {context, response} = createHandlerMocks();+ const {context, response, args} = createHandlerMocks();const aggregates = createMockHeapSnapshotAggregateData();context.getHeapSnapshotAggregates.resolves(aggregates);- await getHeapSnapshotDetails.handler(+ await getHeapSnapshotDetails(args).handler({params: {filePath: 'test.heapsnapshot'}},response,context,@@ -173,11 +173,11 @@ describe('memory', () => {});it('with filters and pagination', async () => {- const {context, response} = createHandlerMocks();+ const {context, response, args} = createHandlerMocks();const aggregates = createMockHeapSnapshotAggregateData();context.getHeapSnapshotAggregates.resolves(aggregates);- await getHeapSnapshotDetails.handler(+ await getHeapSnapshotDetails(args).handler({params: {filePath: 'test.heapsnapshot',@@ -207,11 +207,11 @@ describe('memory', () => {describe('get_heapsnapshot_class_nodes', () => {it('with default options', async () => {- const {context, response} = createHandlerMocks();+ const {context, response, args} = createHandlerMocks();const nodes = createMockItemsRange();context.getHeapSnapshotNodesById.resolves(nodes);- await getHeapSnapshotClassNodes.handler(+ await getHeapSnapshotClassNodes(args).handler({params: {filePath: 'test.heapsnapshot', id: 19}},response,context,@@ -231,11 +231,11 @@ describe('memory', () => {});it('with filters and pagination', async () => {- const {context, response} = createHandlerMocks();+ const {context, response, args} = createHandlerMocks();const nodes = createMockItemsRange();context.getHeapSnapshotNodesById.resolves(nodes);- await getHeapSnapshotClassNodes.handler(+ await getHeapSnapshotClassNodes(args).handler({params: {filePath: 'test.heapsnapshot',@@ -266,11 +266,11 @@ describe('memory', () => {describe('get_heapsnapshot_retainers', () => {it('with default options', async () => {- const {context, response} = createHandlerMocks();+ const {context, response, args} = createHandlerMocks();const retainers = createMockItemsRange();context.getHeapSnapshotRetainers.resolves(retainers);- await getHeapSnapshotRetainers.handler(+ await getHeapSnapshotRetainers(args).handler({params: {filePath: 'test.heapsnapshot', nodeId: 25341}},response,context,@@ -289,11 +289,11 @@ describe('memory', () => {});it('with pagination', async () => {- const {context, response} = createHandlerMocks();+ const {context, response, args} = createHandlerMocks();const retainers = createMockItemsRange();context.getHeapSnapshotRetainers.resolves(retainers);- await getHeapSnapshotRetainers.handler(+ await getHeapSnapshotRetainers(args).handler({params: {filePath: 'test.heapsnapshot',@@ -321,11 +321,11 @@ describe('memory', () => {describe('get_heapsnapshot_object_details', () => {it('with valid nodeId', async () => {- const {context, response} = createHandlerMocks();+ const {context, response, args} = createHandlerMocks();const objectInfo = createMockObjectInfo();context.getHeapSnapshotObjectDetails.resolves(objectInfo);- await getHeapSnapshotObjectDetails.handler(+ await getHeapSnapshotObjectDetails(args).handler({params: {filePath: 'test.heapsnapshot', nodeId: 25341}},response,context,@@ -345,10 +345,10 @@ describe('memory', () => {describe('close_heapsnapshot', () => {it('closes loaded snapshot', async () => {- const {context, response} = createHandlerMocks();+ const {context, response, args} = createHandlerMocks();context.closeHeapSnapshot.resolves(true);- await closeHeapSnapshot.handler(+ await closeHeapSnapshot(args).handler({params: {filePath: 'test.heapsnapshot'}},response,context,@@ -365,11 +365,11 @@ describe('memory', () => {});it('throws error when snapshot was not loaded', async () => {- const {context, response} = createHandlerMocks();+ const {context, response, args} = createHandlerMocks();context.closeHeapSnapshot.resolves(false);await assert.rejects(- closeHeapSnapshot.handler(+ closeHeapSnapshot(args).handler({params: {filePath: 'test.heapsnapshot'}},response,context,@@ -384,11 +384,11 @@ describe('memory', () => {describe('get_heapsnapshot_retaining_paths', () => {it('with default options', async () => {- const {context, response} = createHandlerMocks();+ const {context, response, args} = createHandlerMocks();const retainingPaths = createMockRetainingPaths();context.getHeapSnapshotRetainingPaths.resolves(retainingPaths);- await getHeapSnapshotRetainingPaths.handler(+ await getHeapSnapshotRetainingPaths(args).handler({params: {filePath: 'test.heapsnapshot', nodeId: 45901}},response,context,@@ -409,11 +409,11 @@ describe('memory', () => {});it('with search limits', async () => {- const {context, response} = createHandlerMocks();+ const {context, response, args} = createHandlerMocks();const retainingPaths = createMockRetainingPaths();context.getHeapSnapshotRetainingPaths.resolves(retainingPaths);- await getHeapSnapshotRetainingPaths.handler(+ await getHeapSnapshotRetainingPaths(args).handler({params: {filePath: 'test.heapsnapshot',@@ -444,11 +444,11 @@ describe('memory', () => {describe('get_heapsnapshot_edges', () => {it('with default options', async () => {- const {context, response} = createHandlerMocks();+ const {context, response, args} = createHandlerMocks();const edges = createMockItemsRange();context.getHeapSnapshotEdges.resolves(edges);- await getHeapSnapshotEdges.handler(+ await getHeapSnapshotEdges(args).handler({params: {filePath: 'test.heapsnapshot', nodeId: 25341}},response,context,@@ -471,11 +471,11 @@ describe('memory', () => {});it('with retainedSize range, sortBy, and excludePrimitives', async () => {- const {context, response} = createHandlerMocks();+ const {context, response, args} = createHandlerMocks();const edges = createMockItemsRange();context.getHeapSnapshotEdges.resolves(edges);- await getHeapSnapshotEdges.handler(+ await getHeapSnapshotEdges(args).handler({params: {filePath: 'test.heapsnapshot',@@ -510,11 +510,11 @@ describe('memory', () => {describe('get_heapsnapshot_dominators', () => {it('with valid nodeId', async () => {- const {context, response} = createHandlerMocks();+ const {context, response, args} = createHandlerMocks();const dominators = createMockDominatorChain();context.getHeapSnapshotDominators.resolves(dominators);- await getHeapSnapshotDominators.handler(+ await getHeapSnapshotDominators(args).handler({params: {filePath: 'test.heapsnapshot', nodeId: 25341}},response,context,@@ -534,11 +534,11 @@ describe('memory', () => {describe('compare_heapsnapshots', () => {it('returns summary diff when classIndex is omitted', async () => {- const {context, response} = createHandlerMocks();+ const {context, response, args} = createHandlerMocks();const diffs = createMockClassDiffs();context.getHeapSnapshotClassDiffs.resolves(diffs);- await compareHeapSnapshots.handler(+ await compareHeapSnapshots(args).handler({params: {baseFilePath: 'heap1.heapsnapshot',@@ -561,11 +561,11 @@ describe('memory', () => {});it('returns detailed diff when classIndex is provided', async () => {- const {context, response} = createHandlerMocks();+ const {context, response, args} = createHandlerMocks();const detailedDiff = createMockDetailedClassDiff();context.getHeapSnapshotDetailedClassDiff.resolves(detailedDiff);- await compareHeapSnapshots.handler(+ await compareHeapSnapshots(args).handler({params: {baseFilePath: 'heap1.heapsnapshot',@@ -592,11 +592,11 @@ describe('memory', () => {describe('get_heapsnapshot_duplicate_strings', () => {it('with default options', async () => {- const {context, response} = createHandlerMocks();+ const {context, response, args} = createHandlerMocks();const duplicateStrings = createMockDuplicateStrings();context.getHeapSnapshotDuplicateStrings.resolves(duplicateStrings);- await getHeapSnapshotDuplicateStrings.handler(+ await getHeapSnapshotDuplicateStrings(args).handler({params: {filePath: 'test.heapsnapshot'}},response,context,@@ -614,11 +614,11 @@ describe('memory', () => {});it('with pagination', async () => {- const {context, response} = createHandlerMocks();+ const {context, response, args} = createHandlerMocks();const duplicateStrings = createMockDuplicateStrings();context.getHeapSnapshotDuplicateStrings.resolves(duplicateStrings);- await getHeapSnapshotDuplicateStrings.handler(+ await getHeapSnapshotDuplicateStrings(args).handler({params: {filePath: 'test.heapsnapshot',@@ -644,11 +644,11 @@ describe('memory', () => {describe('query_heapsnapshot_objects', () => {it('with default options', async () => {- const {context, response} = createHandlerMocks();+ const {context, response, args} = createHandlerMocks();const range = createMockItemsRange();context.queryHeapSnapshotObjects.resolves(range);- await queryHeapSnapshotObjects.handler(+ await queryHeapSnapshotObjects(args).handler({params: {filePath: 'test.heapsnapshot'}},response,context,@@ -676,11 +676,11 @@ describe('memory', () => {});it('with all query filters and pagination', async () => {- const {context, response} = createHandlerMocks();+ const {context, response, args} = createHandlerMocks();const range = createMockItemsRange();context.queryHeapSnapshotObjects.resolves(range);- await queryHeapSnapshotObjects.handler(+ await queryHeapSnapshotObjects(args).handler({params: {filePath: 'test.heapsnapshot',diff --git a/tests/tools/network.test.ts b/tests/tools/network.test.tsindex 5d98791f..76927168 100644--- a/tests/tools/network.test.ts+++ b/tests/tools/network.test.ts@@ -23,8 +23,8 @@ describe('network', () => {const server = serverHooks();describe('network_list_requests', () => {it('list requests', async () => {- await withMcpContext(async (response, context) => {- await listNetworkRequests.handler(+ await withMcpContext(async (response, context, args) => {+ await listNetworkRequests(args).handler({params: {}, page: context.getSelectedMcpPage()},response,context,@@ -39,13 +39,13 @@ describe('network', () => {server.addHtmlRoute('/two', html`<main>Second</main>`);server.addHtmlRoute('/three', html`<main>Third</main>`);- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {await context.getSelectedMcpPage().setUpNetworkCollectorForTesting();const page = context.getSelectedMcpPage().pptrPage;await page.goto(server.getRoute('/one'));await page.goto(server.getRoute('/two'));await page.goto(server.getRoute('/three'));- await listNetworkRequests.handler(+ await listNetworkRequests(args).handler({params: {},@@ -66,13 +66,13 @@ describe('network', () => {server.addHtmlRoute('/two', html`<main>Second</main>`);server.addHtmlRoute('/three', html`<main>Third</main>`);- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {await context.getSelectedMcpPage().setUpNetworkCollectorForTesting();const page = context.getSelectedMcpPage().pptrPage;await page.goto(server.getRoute('/one'));await page.goto(server.getRoute('/two'));await page.goto(server.getRoute('/three'));- await listNetworkRequests.handler(+ await listNetworkRequests(args).handler({params: {includePreservedRequests: true,@@ -109,13 +109,13 @@ describe('network', () => {html`<main>I was redirected 2 times</main>`,);- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {await context.getSelectedMcpPage().setUpNetworkCollectorForTesting();const page = context.getSelectedMcpPage().pptrPage;await page.goto(server.getRoute('/redirect'), {waitUntil: 'networkidle0',});- await listNetworkRequests.handler(+ await listNetworkRequests(args).handler({params: {includePreservedRequests: true,@@ -134,10 +134,10 @@ describe('network', () => {});describe('network_get_request', () => {it('attaches request', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.goto('data:text/html,<div>Hello MCP</div>');- await getNetworkRequest.handler(+ await getNetworkRequest(args).handler({params: {reqid: 1}, page: context.getSelectedMcpPage()},response,context,@@ -147,10 +147,10 @@ describe('network', () => {});});it('should not add the request list', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.goto('data:text/html,<div>Hello MCP</div>');- await getNetworkRequest.handler(+ await getNetworkRequest(args).handler({params: {reqid: 1}, page: context.getSelectedMcpPage()},response,context,@@ -163,13 +163,13 @@ describe('network', () => {server.addHtmlRoute('/two', html`<main>Second</main>`);server.addHtmlRoute('/three', html`<main>Third</main>`);- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {await context.getSelectedMcpPage().setUpNetworkCollectorForTesting();const page = context.getSelectedMcpPage().pptrPage;await page.goto(server.getRoute('/one'));await page.goto(server.getRoute('/two'));await page.goto(server.getRoute('/three'));- await getNetworkRequest.handler(+ await getNetworkRequest(args).handler({params: {reqid: 1,diff --git a/tests/tools/pages.test.ts b/tests/tools/pages.test.tsindex b03b349b..1f55514b 100644--- a/tests/tools/pages.test.ts+++ b/tests/tools/pages.test.ts@@ -11,10 +11,7 @@ import {afterEach, describe, it} from 'node:test';import type {Dialog} from 'puppeteer-core';import sinon from 'sinon';-import {- parseArguments,- type ParsedArguments,-} from '../../src/config/mcp-options.js';+import {parseArguments} from '../../src/config/mcp-options.js';import {listPages,newPage,@@ -25,6 +22,7 @@ import {handleDialog,getTabId,} from '../../src/tools/pages.js';+import {createMockParsedArguments} from '../mocks.js';import {assertNoServiceWorkerReported, html, withMcpContext} from '../utils.js';const EXTENSION_SW_PATH = path.join(@@ -47,13 +45,13 @@ describe('pages', () => {describe('list_pages', () => {it('list pages', async () => {- await withMcpContext(async (response, context) => {- await listPages().handler({params: {}}, response, context);+ await withMcpContext(async (response, context, args) => {+ await listPages(args).handler({params: {}}, response, context);assert.ok(response.includePages);});});it('list pages after selected page is closed', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {// Create a second page and select it.const page2 = await context.newPage();assert.strictEqual(context.getSelectedMcpPage(), page2);@@ -62,13 +60,13 @@ describe('pages', () => {await page2.pptrPage.close();// list_pages should still work even though the selected page is gone.- await listPages().handler({params: {}}, response, context);+ await listPages(args).handler({params: {}}, response, context);assert.ok(response.includePages);});});it(`list pages for extension pages with --category-extensions`, async t => {await withMcpContext(- async (response, context) => {+ async (response, context, args) => {const extensionId = await context.installExtension(EXTENSION_PATH);assert.ok(extensionId);@@ -80,9 +78,7 @@ describe('pages', () => {);response.resetResponseLineForTesting();- const listPageDef = listPages({- categoryExtensions: true,- } as ParsedArguments);+ const listPageDef = listPages(args);await listPageDef.handler({params: {}}, response, context);const result = await response.handle(context);@@ -109,7 +105,7 @@ describe('pages', () => {for (const categoryExtensions of [true, false]) {it(`list pages for extension service workers ${categoryExtensions ? 'with' : 'without'} --category-extensions`, async t => {await withMcpContext(- async (response, context) => {+ async (response, context, args) => {const extensionId =await context.installExtension(EXTENSION_SW_PATH);assert.ok(extensionId);@@ -121,9 +117,7 @@ describe('pages', () => {);const swUrl = swTarget.url();- const listPageDef = listPages({- categoryExtensions,- } as ParsedArguments);+ const listPageDef = listPages(args);await listPageDef.handler({params: {}}, response, context);const result = await response.handle(context);@@ -162,7 +156,7 @@ describe('pages', () => {it('list pages for side panels with --category-extensions', async t => {await withMcpContext(- async (response, context) => {+ async (response, context, args) => {const extensionId = await context.installExtension(EXTENSION_SIDE_PANEL_PATH,);@@ -181,9 +175,7 @@ describe('pages', () => {target => target.type() === 'service_worker',);- const listPageDef = listPages({- categoryExtensions: true,- } as ParsedArguments);+ const listPageDef = listPages(args);await listPageDef.handler({params: {}}, response, context);const result = await response.handle(context);@@ -210,7 +202,7 @@ describe('pages', () => {});it('when dialog is open', async t => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;const dialogPromise = new Promise<Dialog>(resolve => {@@ -224,7 +216,7 @@ describe('pages', () => {});const dialog = await dialogPromise;- await listPages().handler({params: {}}, response, context);+ await listPages(args).handler({params: {}}, response, context);const result = await response.handle(context);t.assert.snapshot(JSON.stringify(result));@@ -235,12 +227,12 @@ describe('pages', () => {});describe('new_page', () => {it('create a page', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {assert.strictEqual(context.getPageById(1),context.getSelectedMcpPage(),);- await newPage().handler(+ await newPage(args).handler({params: {url: 'data:text/html,<html></html>'}},response,context,@@ -302,8 +294,8 @@ describe('pages', () => {});});it('throws when URL does not parse with new URL', async () => {- await withMcpContext(async (response, context) => {- const tool = newPage();+ await withMcpContext(async (response, context, args) => {+ const tool = newPage(args);await assert.rejects(async () => {await tool.handler(@@ -320,8 +312,8 @@ describe('pages', () => {});});it('rejects chrome: and chrome-untrusted: URLs', async () => {- await withMcpContext(async (response, context) => {- const tool = newPage();+ await withMcpContext(async (response, context, args) => {+ const tool = newPage(args);await assert.rejects(async () => {await tool.handler(@@ -350,8 +342,8 @@ describe('pages', () => {});});it('rejects chrome-extension: URLs unless categoryExtensions is enabled', async () => {- await withMcpContext(async (response, context) => {- const tool = newPage();+ await withMcpContext(async (response, context, args) => {+ const tool = newPage(args);await assert.rejects(async () => {await tool.handler(@@ -368,8 +360,8 @@ describe('pages', () => {});});it('allows chrome://newtab/', async () => {- await withMcpContext(async (response, context) => {- const tool = newPage();+ await withMcpContext(async (response, context, args) => {+ const tool = newPage(args);await tool.handler({params: {url: 'chrome://newtab/'}},response,@@ -384,7 +376,7 @@ describe('pages', () => {});});it('create a page in the background', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const originalPage = context.getPageById(1);assert.strictEqual(originalPage, context.getSelectedMcpPage());// Ensure original page has focus@@ -393,7 +385,7 @@ describe('pages', () => {await originalPage.pptrPage.evaluate(() => document.hasFocus()),true,);- await newPage().handler(+ await newPage(args).handler({params: {url: 'data:text/html,<html></html>', background: true}},response,context,@@ -413,8 +405,8 @@ describe('pages', () => {});describe('new_page with isolatedContext', () => {it('creates a page in an isolated context', async () => {- await withMcpContext(async (response, context) => {- await newPage().handler(+ await withMcpContext(async (response, context, args) => {+ await newPage(args).handler({params: {url: 'data:text/html,<html></html>',@@ -431,7 +423,7 @@ describe('pages', () => {});it('keeps focus when background is true with isolatedContext', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const originalPage = context.getPageById(1);assert.strictEqual(originalPage, context.getSelectedMcpPage());// Ensure original page has focus@@ -440,7 +432,7 @@ describe('pages', () => {await originalPage.pptrPage.evaluate(() => document.hasFocus()),true,);- await newPage().handler(+ await newPage(args).handler({params: {url: 'data:text/html,<html></html>',@@ -463,8 +455,8 @@ describe('pages', () => {});it('reuses the same context for the same isolatedContext name', async () => {- await withMcpContext(async (response, context) => {- await newPage().handler(+ await withMcpContext(async (response, context, args) => {+ await newPage(args).handler({params: {url: 'data:text/html,<html></html>',@@ -476,7 +468,7 @@ describe('pages', () => {);const mcpPage1 = context.getSelectedMcpPage();const page1 = mcpPage1.pptrPage;- await newPage().handler(+ await newPage(args).handler({params: {url: 'data:text/html,<html></html>',@@ -496,8 +488,8 @@ describe('pages', () => {});it('creates separate contexts for different isolatedContext names', async () => {- await withMcpContext(async (response, context) => {- await newPage().handler(+ await withMcpContext(async (response, context, args) => {+ await newPage(args).handler({params: {url: 'data:text/html,<html></html>',@@ -509,7 +501,7 @@ describe('pages', () => {);const mcpPageA = context.getSelectedMcpPage();const pageA = mcpPageA.pptrPage;- await newPage().handler(+ await newPage(args).handler({params: {url: 'data:text/html,<html></html>',@@ -528,8 +520,8 @@ describe('pages', () => {});it('includes isolatedContext in page listing', async () => {- await withMcpContext(async (response, context) => {- await newPage().handler(+ await withMcpContext(async (response, context, args) => {+ await newPage(args).handler({params: {url: 'data:text/html,<html></html>',@@ -549,10 +541,10 @@ describe('pages', () => {});it('does not set isolatedContext for pages in the default context', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const mcpPage = context.getSelectedMcpPage();assert.strictEqual(mcpPage.isolatedContextName, undefined);- await newPage().handler(+ await newPage(args).handler({params: {url: 'data:text/html,<html></html>'}},response,context,@@ -565,8 +557,8 @@ describe('pages', () => {});it('closes an isolated page without errors', async () => {- await withMcpContext(async (response, context) => {- await newPage().handler(+ await withMcpContext(async (response, context, args) => {+ await newPage(args).handler({params: {url: 'data:text/html,<html></html>',@@ -579,13 +571,13 @@ describe('pages', () => {const page = context.getSelectedMcpPage().pptrPage;const pageId = context.getSelectedMcpPage().id;assert.ok(!page.isClosed());- await closePage.handler({params: {pageId}}, response, context);+ await closePage(args).handler({params: {pageId}}, response, context);assert.ok(page.isClosed());});});it('when dialog is open', async t => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;const dialogPromise = new Promise<Dialog>(resolve => {@@ -599,7 +591,7 @@ describe('pages', () => {});const dialog = await dialogPromise;- await newPage().handler(+ await newPage(args).handler({params: {url: 'data:text/html,<html></html>'}},response,context,@@ -614,8 +606,8 @@ describe('pages', () => {});it('navigate_page targets the pageId page, not the global selection', async () => {- await withMcpContext(async (response, context) => {- await newPage().handler(+ await withMcpContext(async (response, context, args) => {+ await newPage(args).handler({params: {url: 'data:text/html,<h1>Initial</h1>',@@ -628,11 +620,11 @@ describe('pages', () => {const isolatedPage = context.getSelectedMcpPage();// Switch global selection back to the default page.- await selectPage.handler({params: {pageId: 1}}, response, context);+ await selectPage(args).handler({params: {pageId: 1}}, response, context);assert.notStrictEqual(context.getSelectedMcpPage(), isolatedPage);// Navigate using page; should target the isolated page.- await navigatePage().handler(+ await navigatePage(args).handler({params: {url: 'data:text/html,<h1>Navigated</h1>',@@ -659,22 +651,22 @@ describe('pages', () => {describe('close_page', () => {it('closes a page', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = await context.newPage();assert.strictEqual(context.getPageById(2),context.getSelectedMcpPage(),);assert.strictEqual(context.getPageById(2), page);- await closePage.handler({params: {pageId: 2}}, response, context);+ await closePage(args).handler({params: {pageId: 2}}, response, context);assert.ok(page.pptrPage.isClosed());assert.ok(response.includePages);});});it('cannot close the last page', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;- await closePage.handler({params: {pageId: 1}}, response, context);+ await closePage(args).handler({params: {pageId: 1}}, response, context);assert.deepStrictEqual(response.responseLines[0],`The last open page cannot be closed. It is fine to keep it open.`,@@ -685,7 +677,7 @@ describe('pages', () => {});it('when dialog is open', async t => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = await context.newPage();assert.strictEqual(context.getPageById(2),@@ -706,7 +698,7 @@ describe('pages', () => {});await dialogPromise;- await closePage.handler({params: {pageId: 2}}, response, context);+ await closePage(args).handler({params: {pageId: 2}}, response, context);const result = await response.handle(context);t.assert.snapshot(JSON.stringify(result));@@ -715,13 +707,17 @@ describe('pages', () => {});describe('select_page', () => {it('selects a page', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {await context.newPage();assert.strictEqual(context.getPageById(2),context.getSelectedMcpPage(),);- await selectPage.handler({params: {pageId: 1}}, response, context);+ await selectPage(args).handler(+ {params: {pageId: 1}},+ response,+ context,+ );assert.strictEqual(context.getPageById(1),context.getSelectedMcpPage(),@@ -730,7 +726,7 @@ describe('pages', () => {});});it('selects a page and keeps it focused in the background', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {await context.newPage();assert.strictEqual(context.getPageById(2),@@ -742,7 +738,11 @@ describe('pages', () => {.pptrPage.evaluate(() => document.hasFocus()),true,);- await selectPage.handler({params: {pageId: 1}}, response, context);+ await selectPage(args).handler(+ {params: {pageId: 1}},+ response,+ context,+ );assert.strictEqual(context.getPageById(1),context.getSelectedMcpPage(),@@ -757,9 +757,9 @@ describe('pages', () => {});});it('preserves focus across different browser contexts', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {// Create pages in separate isolated contexts.- await newPage().handler(+ await newPage(args).handler({params: {url: 'data:text/html,<html></html>',@@ -772,7 +772,7 @@ describe('pages', () => {const pageA = context.getSelectedMcpPage().pptrPage;const pageAId = context.getSelectedMcpPage().id;- await newPage().handler(+ await newPage(args).handler({params: {url: 'data:text/html,<html></html>',@@ -795,7 +795,7 @@ describe('pages', () => {);// Switching back to pageA should preserve pageB's focus.- await selectPage.handler(+ await selectPage(args).handler({params: {pageId: pageAId}},response,context,@@ -812,7 +812,7 @@ describe('pages', () => {});it('when dialog is open', async t => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;const dialogPromise = new Promise<Dialog>(resolve => {@@ -826,7 +826,11 @@ describe('pages', () => {});const dialog = await dialogPromise;- await selectPage.handler({params: {pageId: 1}}, response, context);+ await selectPage(args).handler(+ {params: {pageId: 1}},+ response,+ context,+ );const result = await response.handle(context);t.assert.snapshot(JSON.stringify(result));@@ -837,8 +841,8 @@ describe('pages', () => {});describe('navigate_page', () => {it('navigates to correct page', async () => {- await withMcpContext(async (response, context) => {- await navigatePage().handler(+ await withMcpContext(async (response, context, args) => {+ await navigatePage(args).handler({params: {url: 'data:text/html,<div>Hello MCP</div>'},page: context.getSelectedMcpPage(),@@ -856,7 +860,7 @@ describe('pages', () => {});it('throws an error if the page was closed not by the MCP server', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = await context.newPage();assert.strictEqual(context.getPageById(2),@@ -867,7 +871,7 @@ describe('pages', () => {await page.pptrPage.close();try {- await navigatePage().handler(+ await navigatePage(args).handler({params: {url: 'data:text/html,<div>Hello MCP</div>'},page: context.getSelectedMcpPage(),@@ -886,12 +890,12 @@ describe('pages', () => {});it('respects the timeout parameter', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;const stub = sinon.stub(page, 'waitForNavigation').resolves(null);try {- await navigatePage().handler(+ await navigatePage(args).handler({params: {url: 'data:text/html,<html></html>',@@ -914,10 +918,10 @@ describe('pages', () => {});});it('go back', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.goto('data:text/html,<div>Hello MCP</div>');- await navigatePage().handler(+ await navigatePage(args).handler({params: {type: 'back'}, page: context.getSelectedMcpPage()},response,context,@@ -931,11 +935,11 @@ describe('pages', () => {});});it('go forward', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.goto('data:text/html,<div>Hello MCP</div>');await page.goBack();- await navigatePage().handler(+ await navigatePage(args).handler({params: {type: 'forward'}, page: context.getSelectedMcpPage()},response,context,@@ -949,10 +953,10 @@ describe('pages', () => {});});it('reload', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.goto('data:text/html,<div>Hello MCP</div>');- await navigatePage().handler(+ await navigatePage(args).handler({params: {type: 'reload'}, page: context.getSelectedMcpPage()},response,context,@@ -967,7 +971,7 @@ describe('pages', () => {});it('reload with accpeting the beforeunload dialog', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html` <script>@@ -980,7 +984,7 @@ describe('pages', () => {// Grant user activation so Chrome permits the beforeunload dialogawait page.mouse.click(10, 10);- await navigatePage().handler(+ await navigatePage(args).handler({params: {type: 'reload'}, page: context.getSelectedMcpPage()},response,context,@@ -996,7 +1000,7 @@ describe('pages', () => {});it('reload with declining the beforeunload dialog', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html` <script>@@ -1009,7 +1013,7 @@ describe('pages', () => {// Grant user activation so Chrome permits the beforeunload dialogawait page.mouse.click(10, 10);- await navigatePage().handler(+ await navigatePage(args).handler({params: {type: 'reload',@@ -1032,8 +1036,8 @@ describe('pages', () => {});it('go forward with error', async () => {- await withMcpContext(async (response, context) => {- await navigatePage().handler(+ await withMcpContext(async (response, context, args) => {+ await navigatePage(args).handler({params: {type: 'forward'}, page: context.getSelectedMcpPage()},response,context,@@ -1048,8 +1052,8 @@ describe('pages', () => {});});it('go back with error', async () => {- await withMcpContext(async (response, context) => {- await navigatePage().handler(+ await withMcpContext(async (response, context, args) => {+ await navigatePage(args).handler({params: {type: 'back'}, page: context.getSelectedMcpPage()},response,context,@@ -1064,8 +1068,8 @@ describe('pages', () => {});});it('navigates to correct page with initScript', async () => {- await withMcpContext(async (response, context) => {- await navigatePage().handler(+ await withMcpContext(async (response, context, args) => {+ await navigatePage(args).handler({params: {url: 'data:text/html,<div>Hello MCP</div>',@@ -1088,7 +1092,7 @@ describe('pages', () => {});it('omits initScript from schema when javascriptEvaluation is false', () => {- const defaultTool = navigatePage();+ const defaultTool = navigatePage(createMockParsedArguments());assert.strictEqual('initScript' in defaultTool.schema, true);const disabledArgs = parseArguments(@@ -1166,8 +1170,8 @@ describe('pages', () => {});it('throws when URL does not parse with new URL', async () => {- await withMcpContext(async (response, context) => {- const tool = navigatePage();+ await withMcpContext(async (response, context, args) => {+ const tool = navigatePage(args);await assert.rejects(async () => {await tool.handler(@@ -1190,8 +1194,8 @@ describe('pages', () => {});it('rejects chrome: and chrome-untrusted: URLs', async () => {- await withMcpContext(async (response, context) => {- const tool = navigatePage();+ await withMcpContext(async (response, context, args) => {+ const tool = navigatePage(args);await assert.rejects(async () => {await tool.handler(@@ -1226,8 +1230,8 @@ describe('pages', () => {});it('rejects chrome-extension: URLs unless categoryExtensions is enabled', async () => {- await withMcpContext(async (response, context) => {- const tool = navigatePage();+ await withMcpContext(async (response, context, args) => {+ const tool = navigatePage(args);await assert.rejects(async () => {await tool.handler(@@ -1248,8 +1252,8 @@ describe('pages', () => {});it('allows chrome://newtab/', async () => {- await withMcpContext(async (response, context) => {- const tool = navigatePage();+ await withMcpContext(async (response, context, args) => {+ const tool = navigatePage(args);await tool.handler({params: {url: 'chrome://newtab/'},@@ -1268,7 +1272,7 @@ describe('pages', () => {});it('when dialog is open', async t => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;const dialogPromise = new Promise<void>(resolve => {page.on('dialog', () => resolve());@@ -1283,7 +1287,7 @@ describe('pages', () => {});await dialogPromise;- await navigatePage().handler(+ await navigatePage(args).handler({params: {url: 'data:text/html,<div>Navigated</div>'},page: context.getSelectedMcpPage(),@@ -1299,14 +1303,14 @@ describe('pages', () => {});describe('resize', () => {it('resize the page', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;const resizePromise = page.evaluate(() => {return new Promise(resolve => {window.addEventListener('resize', resolve, {once: true});});});- await resizePage.handler(+ await resizePage(args).handler({params: {width: 700, height: 500},page: context.getSelectedMcpPage(),@@ -1326,7 +1330,7 @@ describe('pages', () => {});it('resize when window state is normal', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;const browser = page.browser();const windowId = await page.windowId();@@ -1340,7 +1344,7 @@ describe('pages', () => {window.addEventListener('resize', resolve, {once: true});});});- await resizePage.handler(+ await resizePage(args).handler({params: {width: 650, height: 450},page: context.getSelectedMcpPage(),@@ -1360,7 +1364,7 @@ describe('pages', () => {});it('resize when window state is minimized', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;const browser = page.browser();const windowId = await page.windowId();@@ -1374,7 +1378,7 @@ describe('pages', () => {window.addEventListener('resize', resolve, {once: true});});});- await resizePage.handler(+ await resizePage(args).handler({params: {width: 750, height: 550},page: context.getSelectedMcpPage(),@@ -1394,7 +1398,7 @@ describe('pages', () => {});it('resize when window state is maximized', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;const browser = page.browser();const windowId = await page.windowId();@@ -1408,7 +1412,7 @@ describe('pages', () => {window.addEventListener('resize', resolve, {once: true});});});- await resizePage.handler(+ await resizePage(args).handler({params: {width: 725, height: 525},page: context.getSelectedMcpPage(),@@ -1434,7 +1438,7 @@ describe('pages', () => {'resize when window state is fullscreen',{skip: process.platform === 'darwin'},async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;const browser = page.browser();const windowId = await page.windowId();@@ -1448,7 +1452,7 @@ describe('pages', () => {window.addEventListener('resize', resolve, {once: true});});});- await resizePage.handler(+ await resizePage(args).handler({params: {width: 850, height: 650},page: context.getSelectedMcpPage(),@@ -1469,7 +1473,7 @@ describe('pages', () => {);it('when dialog is open', async t => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;const dialogPromise = new Promise<Dialog>(resolve => {page.on('dialog', dialog => {@@ -1482,7 +1486,7 @@ describe('pages', () => {});const dialog = await dialogPromise;- await resizePage.handler(+ await resizePage(args).handler({params: {width: 1600, height: 1400},page: context.getSelectedMcpPage(),@@ -1501,7 +1505,7 @@ describe('pages', () => {describe('dialogs', () => {it('can accept dialogs', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;const dialogPromise = new Promise<void>(resolve => {page.on('dialog', () => {@@ -1512,7 +1516,7 @@ describe('pages', () => {alert('test');});await dialogPromise;- await handleDialog.handler(+ await handleDialog(args).handler({params: {action: 'accept',@@ -1531,7 +1535,7 @@ describe('pages', () => {});});it('can dismiss dialogs', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;const dialogPromise = new Promise<void>(resolve => {page.on('dialog', () => {@@ -1542,7 +1546,7 @@ describe('pages', () => {alert('test');});await dialogPromise;- await handleDialog.handler(+ await handleDialog(args).handler({params: {action: 'dismiss',@@ -1561,7 +1565,7 @@ describe('pages', () => {});});it('can dismiss already dismissed dialog dialogs', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;const dialogPromise = new Promise<Dialog>(resolve => {page.on('dialog', dialog => {@@ -1573,7 +1577,7 @@ describe('pages', () => {});const dialog = await dialogPromise;await dialog.dismiss();- await handleDialog.handler(+ await handleDialog(args).handler({params: {action: 'dismiss',@@ -1592,7 +1596,7 @@ describe('pages', () => {});});it('can handle a dialog on a non-selected page via pageId', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page1 = context.getSelectedMcpPage();await context.newPage(); // page2 is now selected@@ -1607,7 +1611,7 @@ describe('pages', () => {await dialogPromise;// page1 is not selected, but its dialog should be accessible via page.- await handleDialog.handler(+ await handleDialog(args).handler({params: {action: 'accept',@@ -1626,7 +1630,7 @@ describe('pages', () => {});});it('tracks dialogs independently per page', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page1 = context.getSelectedMcpPage();await context.newPage();const page2 = context.getSelectedMcpPage();@@ -1658,7 +1662,7 @@ describe('pages', () => {assert.ok(page2.getDialog());// Handle page1's dialog; page2's should remain.- await handleDialog.handler(+ await handleDialog(args).handler({params: {action: 'accept'}, page: page1},response,context,@@ -1667,7 +1671,7 @@ describe('pages', () => {assert.ok(page2.getDialog());// Handle page2's dialog.- await handleDialog.handler(+ await handleDialog(args).handler({params: {action: 'dismiss'}, page: page2},response,context,@@ -1681,13 +1685,13 @@ describe('pages', () => {describe('get_tab_id', () => {it('returns the tab id', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;// @ts-expect-error _tabId is internal.assert.ok(typeof page._tabId === 'string');// @ts-expect-error _tabId is internal.page._tabId = 'test-tab-id';- await getTabId.handler(+ await getTabId(args).handler({params: {}, page: context.getSelectedMcpPage()},response,context,diff --git a/tests/tools/performance.test.ts b/tests/tools/performance.test.tsindex 72f5bd6c..9ec03518 100644--- a/tests/tools/performance.test.ts+++ b/tests/tools/performance.test.ts@@ -45,13 +45,13 @@ describe('performance', () => {describe('performance_start_trace', () => {it('starts a trace recording', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {context.setIsRunningPerformanceTrace(false);const selectedPage = context.getSelectedMcpPage().pptrPage;sinon.stub(selectedPage, 'url').callsFake(() => 'https://www.test.com');sinon.stub(selectedPage, 'goto').resolves(null);const startTracingStub = sinon.stub(selectedPage.tracing, 'start');- await startTrace.handler(+ await startTrace(args).handler({params: {reload: true, autoStop: false},page: context.getSelectedMcpPage(),@@ -79,12 +79,12 @@ describe('performance', () => {});it('can navigate to about:blank and record a page reload', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const selectedPage = context.getSelectedMcpPage().pptrPage;sinon.stub(selectedPage, 'url').callsFake(() => 'https://www.test.com');const gotoStub = sinon.stub(selectedPage, 'goto');const startTracingStub = sinon.stub(selectedPage.tracing, 'start');- await startTrace.handler(+ await startTrace(args).handler({params: {reload: true, autoStop: false},page: context.getSelectedMcpPage(),@@ -111,7 +111,7 @@ describe('performance', () => {it('can autostop and store a recording', async () => {const rawData = loadTraceAsBuffer('basic-trace.json.gz');- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const selectedPage = context.getSelectedMcpPage().pptrPage;sinon.stub(selectedPage, 'url').callsFake(() => 'https://www.test.com');sinon.stub(selectedPage, 'goto').callsFake(() => Promise.resolve(null));@@ -123,7 +123,7 @@ describe('performance', () => {});const clock = sinon.useFakeTimers();- const handlerPromise = startTrace.handler(+ const handlerPromise = startTrace(args).handler({params: {reload: true, autoStop: true},page: context.getSelectedMcpPage(),@@ -157,11 +157,11 @@ describe('performance', () => {});it('errors if a recording is already active', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {context.setIsRunningPerformanceTrace(true);const selectedPage = context.getSelectedMcpPage().pptrPage;const startTracingStub = sinon.stub(selectedPage.tracing, 'start');- await startTrace.handler(+ await startTrace(args).handler({params: {reload: true, autoStop: false},page: context.getSelectedMcpPage(),@@ -179,7 +179,7 @@ describe('performance', () => {});it('resets the running flag if a setup step throws', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const selectedPage = context.getSelectedMcpPage().pptrPage;sinon.stub(selectedPage, 'url').callsFake(() => 'https://www.test.com');const gotoStub = sinon@@ -190,7 +190,7 @@ describe('performance', () => {.stub(selectedPage.tracing, 'stop').rejects(new Error('Cannot stop recording: tracing was not started'));await assert.rejects(- startTrace.handler(+ startTrace(args).handler({params: {reload: true, autoStop: true},page: context.getSelectedMcpPage(),@@ -206,7 +206,7 @@ describe('performance', () => {// A follow-up start_trace must proceed instead of reporting that a// trace is already running.gotoStub.resolves(null);- await startTrace.handler(+ await startTrace(args).handler({params: {reload: true, autoStop: false},page: context.getSelectedMcpPage(),@@ -225,7 +225,7 @@ describe('performance', () => {// We want to simulate saving it as a .gz file, so the tool should compress it.const expectedCompressedData = zlib.gzipSync(rawData);- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const filePath = 'test-trace.json.gz';const selectedPage = context.getSelectedMcpPage().pptrPage;sinon.stub(selectedPage, 'url').callsFake(() => 'https://www.test.com');@@ -236,7 +236,7 @@ describe('performance', () => {.stub(context, 'saveFile').resolves({filename: filePath});- const handlerPromise = startTrace.handler(+ const handlerPromise = startTrace(args).handler({params: {reload: true, autoStop: true, filePath},page: context.getSelectedMcpPage(),@@ -278,11 +278,11 @@ describe('performance', () => {it('returns the information on the insight', async () => {const trace = await parseTrace('web-dev-with-commit.json.gz');- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {context.storeTraceRecording(trace);context.setIsRunningPerformanceTrace(false);- await analyzeInsight.handler(+ await analyzeInsight(args).handler({params: {insightSetId: 'NAVIGATION_0',@@ -299,8 +299,8 @@ describe('performance', () => {});it('returns an error if no trace has been recorded', async () => {- await withMcpContext(async (response, context) => {- await analyzeInsight.handler(+ await withMcpContext(async (response, context, args) => {+ await analyzeInsight(args).handler({params: {insightSetId: '8463DF94CD61B265B664E7F768183DE3',@@ -324,11 +324,11 @@ describe('performance', () => {describe('performance_stop_trace', () => {it('does nothing if the trace is not running and does not error', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {context.setIsRunningPerformanceTrace(false);const selectedPage = context.getSelectedMcpPage().pptrPage;const stopTracingStub = sinon.stub(selectedPage.tracing, 'stop');- await stopTrace.handler(+ await stopTrace(args).handler({params: {}, page: context.getSelectedMcpPage()},response,context,@@ -340,7 +340,7 @@ describe('performance', () => {it('will stop the trace and return trace info when a trace is running', async () => {const rawData = loadTraceAsBuffer('basic-trace.json.gz');- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {context.setIsRunningPerformanceTrace(true);const selectedPage = context.getSelectedMcpPage().pptrPage;const stopTracingStub = sinon@@ -348,7 +348,7 @@ describe('performance', () => {.callsFake(async () => {return rawData;});- await stopTrace.handler(+ await stopTrace(args).handler({params: {}, page: context.getSelectedMcpPage()},response,context,@@ -364,7 +364,7 @@ describe('performance', () => {});it('throws an error if parsing the trace buffer fails', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {context.setIsRunningPerformanceTrace(true);const selectedPage = context.getSelectedMcpPage().pptrPage;sinon@@ -372,7 +372,7 @@ describe('performance', () => {.returns(Promise.resolve(undefined));await assert.rejects(- stopTrace.handler(+ stopTrace(args).handler({params: {}, page: context.getSelectedMcpPage()},response,context,@@ -384,7 +384,7 @@ describe('performance', () => {it('supports filePath', async () => {const rawData = loadTraceAsBuffer('basic-trace.json.gz');- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const filePath = 'test-trace.json';context.setIsRunningPerformanceTrace(true);const selectedPage = context.getSelectedMcpPage().pptrPage;@@ -395,7 +395,7 @@ describe('performance', () => {.stub(context, 'saveFile').resolves({filename: filePath});- await stopTrace.handler(+ await stopTrace(args).handler({params: {filePath}, page: context.getSelectedMcpPage()},response,context,@@ -415,12 +415,12 @@ describe('performance', () => {it('does not fetch CrUX data if performanceCrux is false', async () => {const rawData = loadTraceAsBuffer('basic-trace.json.gz');await withMcpContext(- async (response, context) => {+ async (response, context, args) => {context.setIsRunningPerformanceTrace(true);const selectedPage = context.getSelectedMcpPage().pptrPage;sinon.stub(selectedPage.tracing, 'stop').resolves(rawData);- await stopTrace.handler(+ await stopTrace(args).handler({params: {}, page: context.getSelectedMcpPage()},response,context,@@ -443,7 +443,7 @@ describe('performance', () => {it('fetches CrUX data for desktop and includes it in the summary', async () => {const rawData = loadTraceAsBuffer('web-dev-with-commit.json.gz');- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {context.setIsRunningPerformanceTrace(true);const selectedPage = context.getSelectedMcpPage().pptrPage;sinon.stub(selectedPage.tracing, 'stop').resolves(rawData);@@ -463,7 +463,7 @@ describe('performance', () => {);});- await stopTrace.handler(+ await stopTrace(args).handler({params: {}, page: context.getSelectedMcpPage()},response,context,@@ -496,7 +496,7 @@ describe('performance', () => {);const modifiedData = new TextEncoder().encode(modifiedJsonString);- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {context.setIsRunningPerformanceTrace(true);const selectedPage = context.getSelectedMcpPage().pptrPage;sinon.stub(selectedPage.tracing, 'stop').resolves(modifiedData);@@ -527,7 +527,7 @@ describe('performance', () => {);});- await stopTrace.handler(+ await stopTrace(args).handler({params: {}, page: context.getSelectedMcpPage()},response,context,diff --git a/tests/tools/pwa.test.ts b/tests/tools/pwa.test.tsindex 9f86d0c7..773faaf3 100644--- a/tests/tools/pwa.test.ts+++ b/tests/tools/pwa.test.ts@@ -88,8 +88,8 @@ describe('pwa', () => {it('installs a PWA, reads its OS state, and uninstalls it', async () => {const {manifestId, startUrl} = setupPwaRoutes();await withMcpContext(- async (response, context) => {- await installPwa.handler(+ async (response, context, args) => {+ await installPwa(args).handler({params: {manifestId, installUrlOrBundleUrl: startUrl}},response,context,@@ -100,7 +100,11 @@ describe('pwa', () => {);response.resetResponseLineForTesting();- await getOsAppState.handler({params: {manifestId}}, response, context);+ await getOsAppState(args).handler(+ {params: {manifestId}},+ response,+ context,+ );const stateOutput = response.responseLines.join('\n');assert.ok(stateOutput.includes('Badge count: 0'),@@ -112,7 +116,11 @@ describe('pwa', () => {);const includePages = sinon.spy(response, 'setIncludePages');- await uninstallPwa.handler({params: {manifestId}}, response, context);+ await uninstallPwa(args).handler(+ {params: {manifestId}},+ response,+ context,+ );assert.ok(includePages.calledOnce,'uninstall should refresh the page list after closing app windows',@@ -120,7 +128,11 @@ describe('pwa', () => {// Querying OS state after uninstall should reject.await assert.rejects(- getOsAppState.handler({params: {manifestId}}, response, context),+ getOsAppState(args).handler(+ {params: {manifestId}},+ response,+ context,+ ),);},PWA_BROWSER_OPTIONS,@@ -131,7 +143,7 @@ describe('pwa', () => {it('does not require a selected page for browser-scoped operations', async () => {const {manifestId, startUrl} = setupPwaRoutes();await withMcpContext(- async (response, context) => {+ async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;sinon.stub(context, 'getSelectedMcpPage')@@ -143,14 +155,26 @@ describe('pwa', () => {.resolves({badgeCount: 0, fileHandlers: []});const uninstall = sinon.stub(context, 'uninstallPWA').resolves();- await installPwa.handler(+ await installPwa(args).handler({params: {manifestId, installUrlOrBundleUrl: startUrl}},response,context,);- await launchPwa.handler({params: {manifestId}}, response, context);- await getOsAppState.handler({params: {manifestId}}, response, context);- await uninstallPwa.handler({params: {manifestId}}, response, context);+ await launchPwa(args).handler(+ {params: {manifestId}},+ response,+ context,+ );+ await getOsAppState(args).handler(+ {params: {manifestId}},+ response,+ context,+ );+ await uninstallPwa(args).handler(+ {params: {manifestId}},+ response,+ context,+ );assert.ok(install.calledOnce);assert.ok(launch.calledOnce);@@ -165,8 +189,8 @@ describe('pwa', () => {it('launches an installed PWA in a standalone window', async () => {const {manifestId, startUrl} = setupPwaRoutes();await withMcpContext(- async (response, context) => {- await installPwa.handler(+ async (response, context, args) => {+ await installPwa(args).handler({params: {manifestId,@@ -179,7 +203,11 @@ describe('pwa', () => {);response.resetResponseLineForTesting();- await launchPwa.handler({params: {manifestId}}, response, context);+ await launchPwa(args).handler(+ {params: {manifestId}},+ response,+ context,+ );assert.ok(response.responseLines.some(l => l.includes(startUrl)),`launch response should reference the app url, got: ${response.responseLines.join('\n')}`,@@ -202,7 +230,11 @@ describe('pwa', () => {'the launched app should be in standalone display mode',);- await uninstallPwa.handler({params: {manifestId}}, response, context);+ await uninstallPwa(args).handler(+ {params: {manifestId}},+ response,+ context,+ );},PWA_BROWSER_OPTIONS,{categoryPwa: true},@@ -212,8 +244,8 @@ describe('pwa', () => {it('launches an installed PWA at an explicit URL', async () => {const {manifestId, startUrl, explicitUrl} = setupPwaRoutes();await withMcpContext(- async (response, context) => {- await installPwa.handler(+ async (response, context, args) => {+ await installPwa(args).handler({params: {manifestId,@@ -226,7 +258,7 @@ describe('pwa', () => {);response.resetResponseLineForTesting();- await launchPwa.handler(+ await launchPwa(args).handler({params: {manifestId, url: explicitUrl}},response,context,@@ -243,7 +275,11 @@ describe('pwa', () => {});assert.ok(appTarget, 'the explicit launch target should exist');- await uninstallPwa.handler({params: {manifestId}}, response, context);+ await uninstallPwa(args).handler(+ {params: {manifestId}},+ response,+ context,+ );},PWA_BROWSER_OPTIONS,{categoryPwa: true},@@ -253,9 +289,9 @@ describe('pwa', () => {it('selects a surviving page after uninstall closes the selected app', async () => {const {manifestId, startUrl} = setupPwaRoutes();await withMcpContext(- async (response, context) => {+ async (response, context, args) => {const originalPage = context.getSelectedMcpPage();- await installPwa.handler(+ await installPwa(args).handler({params: {manifestId,@@ -266,7 +302,11 @@ describe('pwa', () => {response,context,);- await launchPwa.handler({params: {manifestId}}, response, context);+ await launchPwa(args).handler(+ {params: {manifestId}},+ response,+ context,+ );await context.createPagesSnapshot();const appPage = context.getPages().find(page => {return page.pptrPage.url() === startUrl;@@ -275,7 +315,11 @@ describe('pwa', () => {context.selectPage(appPage);response.resetResponseLineForTesting();- await uninstallPwa.handler({params: {manifestId}}, response, context);+ await uninstallPwa(args).handler(+ {params: {manifestId}},+ response,+ context,+ );const result = await response.handle(context);assert.strictEqual(context.getSelectedMcpPage(), originalPage);diff --git a/tests/tools/screencast.test.ts b/tests/tools/screencast.test.tsindex a5a7e4af..69fca526 100644--- a/tests/tools/screencast.test.ts+++ b/tests/tools/screencast.test.ts@@ -22,11 +22,11 @@ function createMockScreenRecorder(): sinon.SinonStubbedInstance<ScreenRecorder>}function createScreencastMocks() {- const {page, context, response} = createHandlerMocks();+ const {page, context, response, args} = createHandlerMocks();const mockRecorder = createMockScreenRecorder();page.pptrPage.screencast.resolves(mockRecorder);context.getScreenRecorder.returns(null);- return {page, context, response, mockRecorder};+ return {page, context, response, mockRecorder, args};}describe('screencast', () => {@@ -36,7 +36,8 @@ describe('screencast', () => {describe('screencast_start', () => {it('starts a screencast recording with filePath', async () => {- const {page, context, response, mockRecorder} = createScreencastMocks();+ const {page, context, response, mockRecorder, args} =+ createScreencastMocks();const filePath: `${string}.mp4` = `${path.join(os.tmpdir(),@@ -44,7 +45,7 @@ describe('screencast', () => {)}.mp4`;context.ensureExtension.resolves(filePath);- await startScreencast().handler(+ await startScreencast(args).handler({params: {filePath},page,@@ -75,7 +76,8 @@ describe('screencast', () => {});it('records WebM for an uppercase extension (case-insensitive)', async () => {- const {page, context, response, mockRecorder} = createScreencastMocks();+ const {page, context, response, mockRecorder, args} =+ createScreencastMocks();const requestedPath = `${path.join(os.tmpdir(), 'test-recording')}.WEBM`;const expectedPath: `${string}.webm` = `${path.join(@@ -84,7 +86,7 @@ describe('screencast', () => {)}.webm`;context.ensureExtension.resolves(expectedPath);- await startScreencast().handler(+ await startScreencast(args).handler({params: {filePath: requestedPath},page,@@ -111,11 +113,11 @@ describe('screencast', () => {});it('rejects an unsupported extension instead of silently using mp4', async () => {- const {page, context, response} = createScreencastMocks();+ const {page, context, response, args} = createScreencastMocks();const filePath = `${path.join(os.tmpdir(), 'recording')}.avi`;await assert.rejects(- startScreencast().handler(+ startScreencast(args).handler({params: {filePath},page,@@ -132,14 +134,19 @@ describe('screencast', () => {});it('starts a screencast recording with temp file when no filePath', async () => {- const {page, context, response, mockRecorder} = createScreencastMocks();+ const {page, context, response, mockRecorder, args} =+ createScreencastMocks();const expectedPath: `${string}.mp4` = `${path.join(os.tmpdir(),'temp-screencast',)}.mp4`;context.ensureExtension.resolves(expectedPath);- await startScreencast().handler({params: {}, page}, response, context);+ await startScreencast(args).handler(+ {params: {}, page},+ response,+ context,+ );sinon.assert.calledOnce(context.ensureExtension);assert.ok(context.ensureExtension.firstCall.args[0].endsWith('.mp4'));@@ -157,13 +164,18 @@ describe('screencast', () => {});it('errors if a recording is already active', async () => {- const {page, context, response, mockRecorder} = createScreencastMocks();+ const {page, context, response, mockRecorder, args} =+ createScreencastMocks();context.getScreenRecorder.returns({recorder: mockRecorder,filePath: `${path.join(os.tmpdir(), 'existing')}.mp4`,});- await startScreencast().handler({params: {}, page}, response, context);+ await startScreencast(args).handler(+ {params: {}, page},+ response,+ context,+ );sinon.assert.notCalled(context.ensureExtension);sinon.assert.notCalled(page.pptrPage.screencast);@@ -175,13 +187,13 @@ describe('screencast', () => {});it('provides a clear error when ffmpeg is not found', async () => {- const {page, context, response} = createScreencastMocks();+ const {page, context, response, args} = createScreencastMocks();const filePath: `${string}.mp4` = `${path.join(os.tmpdir(), 'test')}.mp4`;context.ensureExtension.resolves(filePath);page.pptrPage.screencast.rejects(new Error('spawn ffmpeg ENOENT'));await assert.rejects(- startScreencast().handler(+ startScreencast(args).handler({params: {filePath},page,@@ -201,12 +213,12 @@ describe('screencast', () => {});it('cleans up the generated temp directory if recording fails to start', async () => {- const {page, context, response} = createScreencastMocks();+ const {page, context, response, args} = createScreencastMocks();context.ensureExtension.callsFake(async filePath => `${filePath}.mp4`);page.pptrPage.screencast.rejects(new Error('spawn ffmpeg ENOENT'));await assert.rejects(- startScreencast().handler({params: {}, page}, response, context),+ startScreencast(args).handler({params: {}, page}, response, context),/ffmpeg is required for screencast recording/,);@@ -288,8 +300,8 @@ describe('screencast', () => {describe('screencast_stop', () => {it('returns an error message if no recording is active', async () => {- const {page, context, response} = createScreencastMocks();- await stopScreencast.handler({params: {}, page}, response, context);+ const {page, context, response, args} = createScreencastMocks();+ await stopScreencast(args).handler({params: {}, page}, response, context);sinon.assert.notCalled(context.setScreenRecorder);sinon.assert.calledOnceWithExactly(response.appendResponseLine,@@ -298,14 +310,15 @@ describe('screencast', () => {});it('stops an active recording and reports the file path', async () => {- const {page, context, response, mockRecorder} = createScreencastMocks();+ const {page, context, response, mockRecorder, args} =+ createScreencastMocks();const filePath = `${path.join(os.tmpdir(), 'test-recording')}.mp4`;context.getScreenRecorder.returns({recorder: mockRecorder,filePath,});- await stopScreencast.handler({params: {}, page}, response, context);+ await stopScreencast(args).handler({params: {}, page}, response, context);sinon.assert.calledOnce(mockRecorder.stop);sinon.assert.calledOnceWithExactly(context.setScreenRecorder, null);@@ -316,7 +329,8 @@ describe('screencast', () => {});it('clears the recorder even if stop() throws', async () => {- const {page, context, response, mockRecorder} = createScreencastMocks();+ const {page, context, response, mockRecorder, args} =+ createScreencastMocks();mockRecorder.stop.rejects(new Error('ffmpeg process error'));const filePath = `${path.join(os.tmpdir(), 'test')}.mp4`;context.getScreenRecorder.returns({@@ -325,7 +339,7 @@ describe('screencast', () => {});await assert.rejects(- stopScreencast.handler({params: {}, page}, response, context),+ stopScreencast(args).handler({params: {}, page}, response, context),/ffmpeg process error/,);diff --git a/tests/tools/script.test.ts b/tests/tools/script.test.tsindex c92811e2..536ea6e6 100644--- a/tests/tools/script.test.ts+++ b/tests/tools/script.test.ts@@ -34,8 +34,8 @@ describe('script', () => {describe('browser_evaluate_script', () => {it('evaluates', async () => {- await withMcpContext(async (response, context) => {- await evaluateScript().handler(+ await withMcpContext(async (response, context, args) => {+ await evaluateScript(args).handler({params: {function: String(() => 2 * 5)},},@@ -47,10 +47,10 @@ describe('script', () => {});});it('skips the stable DOM wait when waitForStableDom is false', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const spy = sinon.spy(WaitForHelper.prototype, 'waitForStableDom');try {- await evaluateScript().handler(+ await evaluateScript(args).handler({params: {function: String(() => 1), waitForStableDom: false},},@@ -59,7 +59,7 @@ describe('script', () => {);sinon.assert.notCalled(spy);- await evaluateScript().handler(+ await evaluateScript(args).handler({params: {function: String(() => 1)},},@@ -73,8 +73,8 @@ describe('script', () => {});});it('runs in selected page', async () => {- await withMcpContext(async (response, context) => {- await evaluateScript().handler(+ await withMcpContext(async (response, context, args) => {+ await evaluateScript(args).handler({params: {function: String(() => document.title)},},@@ -93,7 +93,7 @@ describe('script', () => {`);response.resetResponseLineForTesting();- await evaluateScript().handler(+ await evaluateScript(args).handler({params: {function: String(() => document.title)},},@@ -107,12 +107,12 @@ describe('script', () => {});it('work for complex objects', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<script src="./scripts.js"></script> `);- await evaluateScript().handler(+ await evaluateScript(args).handler({params: {function: String(() => {@@ -135,12 +135,12 @@ describe('script', () => {});it('work for scripts that trigger dialogs', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<button id="test">test</button>`);- await evaluateScript().handler(+ await evaluateScript(args).handler({params: {function: String(() => {@@ -158,12 +158,12 @@ describe('script', () => {});it('work for scripts that trigger dialogs and dismiss them', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<button id="test">test</button>`);- await evaluateScript().handler(+ await evaluateScript(args).handler({params: {function: String(() => {@@ -181,12 +181,12 @@ describe('script', () => {});it('work for scripts that trigger prompts and fill them', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<button id="test">test</button>`);- await evaluateScript().handler(+ await evaluateScript(args).handler({params: {function: String(() => {@@ -204,12 +204,12 @@ describe('script', () => {});it('work for async functions', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<script src="./scripts.js"></script> `);- await evaluateScript().handler(+ await evaluateScript(args).handler({params: {function: String(async () => {@@ -227,7 +227,7 @@ describe('script', () => {});it('work with one argument', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<button id="test">test</button>`);@@ -236,7 +236,7 @@ describe('script', () => {context.getSelectedMcpPage(),);- await evaluateScript().handler(+ await evaluateScript(args).handler({params: {function: String(async (el: Element) => {@@ -254,7 +254,7 @@ describe('script', () => {});it('work with multiple args', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.setContent(html`<button id="test">test</button>`);@@ -263,7 +263,7 @@ describe('script', () => {context.getSelectedMcpPage(),);- await evaluateScript().handler(+ await evaluateScript(args).handler({params: {function: String((container: Element, child: Element) => {@@ -287,13 +287,13 @@ describe('script', () => {);server.addHtmlRoute('/main', html`<iframe src="/iframe"></iframe>`);- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = context.getSelectedMcpPage().pptrPage;await page.goto(server.getRoute('/main'));context.getSelectedMcpPage().textSnapshot = await TextSnapshot.create(context.getSelectedMcpPage(),);- await evaluateScript().handler(+ await evaluateScript(args).handler({params: {function: String((element: Element) => {@@ -315,8 +315,8 @@ describe('script', () => {const {join} = await import('node:path');const filePath = join(tmpdir(), 'test-evaluate-script-output.json');try {- await withMcpContext(async (response, context) => {- await evaluateScript().handler(+ await withMcpContext(async (response, context, args) => {+ await evaluateScript(args).handler({params: {function: String(() => ({hello: 'world'})),@@ -340,8 +340,8 @@ describe('script', () => {});it('evaluates inside extension service worker', async () => {await withMcpContext(- async (response, context) => {- await installExtension.handler(+ async (response, context, args) => {+ await installExtension(args).handler({params: {path: EXTENSION_PATH}},response,context,diff --git a/tests/tools/slim/tools.test.ts b/tests/tools/slim/tools.test.tsindex 3d9543e3..13f7e99c 100644--- a/tests/tools/slim/tools.test.ts+++ b/tests/tools/slim/tools.test.ts@@ -23,22 +23,22 @@ describe('slim', () => {});it('evaluates', async () => {- const {page, context, response} = createHandlerMocks();+ const {page, context, response, args} = createHandlerMocks();const script = '2 * 5';page.pptrPage.evaluate.resolves(10);- await evaluate.handler({params: {script}, page}, response, context);+ await evaluate(args).handler({params: {script}, page}, response, context);sinon.assert.calledOnceWithExactly(page.pptrPage.evaluate, script);sinon.assert.calledOnceWithExactly(response.appendResponseLine, '10');});it('handles errors', async () => {- const {page, context, response} = createHandlerMocks();+ const {page, context, response, args} = createHandlerMocks();const script = "throw new Error('test error')";page.pptrPage.evaluate.rejects(new Error('test error'));- await evaluate.handler({params: {script}, page}, response, context);+ await evaluate(args).handler({params: {script}, page}, response, context);sinon.assert.calledOnceWithExactly(page.pptrPage.evaluate, script);sinon.assert.calledOnceWithExactly(@@ -48,8 +48,8 @@ describe('slim', () => {});it('navigates to correct page', async t => {- await withMcpContext(async (response, context) => {- await navigate().handler(+ await withMcpContext(async (response, context, args) => {+ await navigate(args).handler({params: {url: 'data:text/html,<div>Hello MCP</div>'},page: context.getSelectedMcpPage(),@@ -68,11 +68,11 @@ describe('slim', () => {});it('throws when URL does not parse with new URL', async () => {- const {page, context, response} = createHandlerMocks();+ const {page, context, response, args} = createHandlerMocks();await assert.rejects(async () => {- await navigate().handler(+ await navigate(args).handler({params: {url: 'not a valid url'}, page},response,context,@@ -139,8 +139,8 @@ describe('slim', () => {});it('rejects chrome: and chrome-untrusted: URLs', async () => {- const {page, context, response} = createHandlerMocks();- const tool = navigate();+ const {page, context, response, args} = createHandlerMocks();+ const tool = navigate(args);await assert.rejects(async () => {await tool.handler(@@ -170,11 +170,11 @@ describe('slim', () => {});it('with default options', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const fixture = screenshots.basic;const page = context.getSelectedMcpPage().pptrPage;await page.setContent(fixture.html);- await screenshot.handler(+ await screenshot(args).handler({params: {format: 'png'}, page: context.getSelectedMcpPage()},response,context,diff --git a/tests/tools/snapshot.test.ts b/tests/tools/snapshot.test.tsindex 1bc5bb91..94f06268 100644--- a/tests/tools/snapshot.test.ts+++ b/tests/tools/snapshot.test.ts@@ -18,8 +18,8 @@ describe('snapshot', () => {describe('take_snapshot', () => {it('includes a snapshot', async () => {- const {page, context, response} = createHandlerMocks();- await takeSnapshot.handler({params: {}, page}, response, context);+ const {page, context, response, args} = createHandlerMocks();+ await takeSnapshot(args).handler({params: {}, page}, response, context);sinon.assert.calledOnceWithExactly(response.includeSnapshot, {verbose: false,filePath: undefined,@@ -27,8 +27,8 @@ describe('snapshot', () => {});it('includes a snapshot with parameters', async () => {- const {page, context, response} = createHandlerMocks();- await takeSnapshot.handler(+ const {page, context, response, args} = createHandlerMocks();+ await takeSnapshot(args).handler({params: {verbose: true, filePath: 'custom/path.txt'}, page},response,context,@@ -42,8 +42,8 @@ describe('snapshot', () => {describe('wait_for', () => {it('waits for text and appends response line', async () => {- const {page, context, response} = createHandlerMocks();- await waitFor.handler(+ const {page, context, response, args} = createHandlerMocks();+ await waitFor(args).handler({params: {text: ['Hello']}, page},response,context,@@ -61,8 +61,8 @@ describe('snapshot', () => {});it('waits for text with timeout', async () => {- const {page, context, response} = createHandlerMocks();- await waitFor.handler(+ const {page, context, response, args} = createHandlerMocks();+ await waitFor(args).handler({params: {text: ['Complete', 'Error'], timeout: 5000}, page},response,context,diff --git a/tests/tools/thirdPartyDeveloper.test.ts b/tests/tools/thirdPartyDeveloper.test.tsindex 5a61e21c..4316e973 100644--- a/tests/tools/thirdPartyDeveloper.test.ts+++ b/tests/tools/thirdPartyDeveloper.test.ts@@ -9,6 +9,7 @@ import {describe, it} from 'node:test';import sinon from 'sinon';+import type {ParsedArguments} from '../../src/config/mcp-options.js';import type {McpContext} from '../../src/McpContext.js';import type {McpResponse} from '../../src/McpResponse.js';import {TextSnapshot} from '../../src/TextSnapshot.js';@@ -23,7 +24,7 @@ describe('thirdPartyDeveloperTools', () => {describe('list_3p_developer_tools', () => {it('lists tools', async () => {await withMcpContext(- async (response, context) => {+ async (response, context, args) => {const page = await context.newPage();response.setPage(page);@@ -51,7 +52,7 @@ describe('thirdPartyDeveloperTools', () => {});});- await listThirdPartyDeveloperTools.handler(+ await listThirdPartyDeveloperTools(args).handler({params: {}, page},response,context,@@ -84,7 +85,7 @@ describe('thirdPartyDeveloperTools', () => {it('handles empty response', async () => {await withMcpContext(- async (response, context) => {+ async (response, context, args) => {const page = await context.newPage();response.setPage(page);await page.pptrPage.evaluate(() => {@@ -94,7 +95,7 @@ describe('thirdPartyDeveloperTools', () => {});});- await listThirdPartyDeveloperTools.handler(+ await listThirdPartyDeveloperTools(args).handler({params: {}, page},response,context,@@ -118,7 +119,7 @@ describe('thirdPartyDeveloperTools', () => {it('handles no response', async () => {await withMcpContext(- async (response, context) => {+ async (response, context, args) => {const page = await context.newPage();response.setPage(page);await page.pptrPage.evaluate(() => {@@ -127,7 +128,7 @@ describe('thirdPartyDeveloperTools', () => {});});- await listThirdPartyDeveloperTools.handler(+ await listThirdPartyDeveloperTools(args).handler({params: {}, page},response,context,@@ -151,10 +152,10 @@ describe('thirdPartyDeveloperTools', () => {it('handles no eventListener', async () => {await withMcpContext(- async (response, context) => {+ async (response, context, args) => {const page = await context.newPage();response.setPage(page);- await listThirdPartyDeveloperTools.handler(+ await listThirdPartyDeveloperTools(args).handler({params: {}, page},response,context,@@ -178,7 +179,7 @@ describe('thirdPartyDeveloperTools', () => {it('lists multiple toolgroups', async () => {await withMcpContext(- async (response, context) => {+ async (response, context, args) => {const page = await context.newPage();response.setPage(page);@@ -215,7 +216,7 @@ describe('thirdPartyDeveloperTools', () => {});});- await listThirdPartyDeveloperTools.handler(+ await listThirdPartyDeveloperTools(args).handler({params: {}, page},response,context,@@ -237,7 +238,7 @@ describe('thirdPartyDeveloperTools', () => {it('clears window.__dtmcp.toolGroups on subsequent getToolGroups calls', async () => {await withMcpContext(- async (response, context) => {+ async (response, context, args) => {const page = await context.newPage();response.setPage(page);@@ -260,7 +261,7 @@ describe('thirdPartyDeveloperTools', () => {});});- await listThirdPartyDeveloperTools.handler(+ await listThirdPartyDeveloperTools(args).handler({params: {}, page},response,context,@@ -272,7 +273,7 @@ describe('thirdPartyDeveloperTools', () => {);assert.strictEqual(groupsLength, 1);- await listThirdPartyDeveloperTools.handler(+ await listThirdPartyDeveloperTools(args).handler({params: {}, page},response,context,@@ -294,12 +295,13 @@ describe('thirdPartyDeveloperTools', () => {async function setupThirdPartyDeveloperTools(response: McpResponse,context: McpContext,+ args: ParsedArguments,evaluateFn: () => void,) {const page = await context.newPage();response.setPage(page);await page.pptrPage.evaluate(evaluateFn);- await listThirdPartyDeveloperTools.handler(+ await listThirdPartyDeveloperTools(args).handler({params: {}, page},response,context,@@ -309,8 +311,8 @@ describe('thirdPartyDeveloperTools', () => {it('executes a tool', async () => {await withMcpContext(- async (response, context) => {- await setupThirdPartyDeveloperTools(response, context, () => {+ async (response, context, args) => {+ await setupThirdPartyDeveloperTools(response, context, args, () => {const mockToolGroup = {name: 'test-group',description: 'test description',@@ -335,7 +337,7 @@ describe('thirdPartyDeveloperTools', () => {});});- await executeThirdPartyDeveloperTool.handler(+ await executeThirdPartyDeveloperTool(args).handler({params: {toolName: 'test-tool',@@ -357,8 +359,8 @@ describe('thirdPartyDeveloperTools', () => {});it('throws if tool not found in list', async () => {- await withMcpContext(async (response, context) => {- await setupThirdPartyDeveloperTools(response, context, () => {+ await withMcpContext(async (response, context, args) => {+ await setupThirdPartyDeveloperTools(response, context, args, () => {const mockToolGroup = {name: 'test-group',description: 'test description',@@ -372,7 +374,7 @@ describe('thirdPartyDeveloperTools', () => {await assert.rejects(async () => {- await executeThirdPartyDeveloperTool.handler(+ await executeThirdPartyDeveloperTool(args).handler({params: {toolName: 'missing-tool',@@ -391,8 +393,8 @@ describe('thirdPartyDeveloperTools', () => {it('throws if parameters are invalid', async () => {await withMcpContext(- async (response, context) => {- await setupThirdPartyDeveloperTools(response, context, () => {+ async (response, context, args) => {+ await setupThirdPartyDeveloperTools(response, context, args, () => {const mockToolGroup = {name: 'test-group',description: 'test description',@@ -419,7 +421,7 @@ describe('thirdPartyDeveloperTools', () => {await assert.rejects(async () => {- await executeThirdPartyDeveloperTool.handler(+ await executeThirdPartyDeveloperTool(args).handler({params: {toolName: 'test-tool',@@ -441,8 +443,8 @@ describe('thirdPartyDeveloperTools', () => {it('handles JSON result', async () => {await withMcpContext(- async (response, context) => {- await setupThirdPartyDeveloperTools(response, context, () => {+ async (response, context, args) => {+ await setupThirdPartyDeveloperTools(response, context, args, () => {const mockToolGroup = {name: 'test-group',description: 'test description',@@ -461,7 +463,7 @@ describe('thirdPartyDeveloperTools', () => {});});- await executeThirdPartyDeveloperTool.handler(+ await executeThirdPartyDeveloperTool(args).handler({params: {toolName: 'test-tool',@@ -483,7 +485,7 @@ describe('thirdPartyDeveloperTools', () => {});it('replaces uid with element handle in params', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const page = await context.newPage();response.setPage(page);@@ -548,7 +550,7 @@ describe('thirdPartyDeveloperTools', () => {throw new Error('Not found');};- await executeThirdPartyDeveloperTool.handler(+ await executeThirdPartyDeveloperTool(args).handler({params: {toolName: 'test-tool',@@ -577,8 +579,8 @@ describe('thirdPartyDeveloperTools', () => {it('processToolResult replaces functions with "<Function object>"', async () => {await withMcpContext(- async (response, context) => {- await setupThirdPartyDeveloperTools(response, context, () => {+ async (response, context, args) => {+ await setupThirdPartyDeveloperTools(response, context, args, () => {const mockToolGroup = {name: 'test-group',description: 'test description',@@ -600,7 +602,7 @@ describe('thirdPartyDeveloperTools', () => {});});- await executeThirdPartyDeveloperTool.handler(+ await executeThirdPartyDeveloperTool(args).handler({params: {toolName: 'test-tool',@@ -623,8 +625,8 @@ describe('thirdPartyDeveloperTools', () => {it('processToolResult replaces circular references with "<Circular reference>"', async () => {await withMcpContext(- async (response, context) => {- await setupThirdPartyDeveloperTools(response, context, () => {+ async (response, context, args) => {+ await setupThirdPartyDeveloperTools(response, context, args, () => {const mockToolGroup = {name: 'test-group',description: 'test description',@@ -647,7 +649,7 @@ describe('thirdPartyDeveloperTools', () => {});});- await executeThirdPartyDeveloperTool.handler(+ await executeThirdPartyDeveloperTool(args).handler({params: {toolName: 'test-tool',@@ -670,8 +672,8 @@ describe('thirdPartyDeveloperTools', () => {it('processToolResult replaces non-plain objects with "<ConstructorName instance>"', async () => {await withMcpContext(- async (response, context) => {- await setupThirdPartyDeveloperTools(response, context, () => {+ async (response, context, args) => {+ await setupThirdPartyDeveloperTools(response, context, args, () => {class CustomClass {val = 'value';}@@ -696,7 +698,7 @@ describe('thirdPartyDeveloperTools', () => {});});- await executeThirdPartyDeveloperTool.handler(+ await executeThirdPartyDeveloperTool(args).handler({params: {toolName: 'test-tool',@@ -723,7 +725,7 @@ describe('thirdPartyDeveloperTools', () => {it('stashDOMElement stashes elements and returns UID', async () => {await withMcpContext(- async (response, context) => {+ async (response, context, args) => {const page = await context.newPage();response.setPage(page);@@ -752,7 +754,7 @@ describe('thirdPartyDeveloperTools', () => {};});- await executeThirdPartyDeveloperTool.handler(+ await executeThirdPartyDeveloperTool(args).handler({params: {toolName: 'test-tool',@@ -776,7 +778,7 @@ describe('thirdPartyDeveloperTools', () => {it('creates a new snapshot if the third-party developer tool response contains a DOM element', async () => {await withMcpContext(- async (response, context) => {+ async (response, context, args) => {const page = await context.newPage();response.setPage(page);@@ -805,7 +807,7 @@ describe('thirdPartyDeveloperTools', () => {};});- await executeThirdPartyDeveloperTool.handler(+ await executeThirdPartyDeveloperTool(args).handler({params: {toolName: 'test-tool',@@ -829,7 +831,7 @@ describe('thirdPartyDeveloperTools', () => {it('does not create a new snapshot if the third-party developer tool response does not contain a DOM element', async () => {await withMcpContext(- async (response, context) => {+ async (response, context, args) => {const page = await context.newPage();response.setPage(page);@@ -859,7 +861,7 @@ describe('thirdPartyDeveloperTools', () => {.stub(TextSnapshot, 'create').resolves({} as TextSnapshot);- await executeThirdPartyDeveloperTool.handler(+ await executeThirdPartyDeveloperTool(args).handler({params: {toolName: 'test-tool',@@ -889,8 +891,8 @@ describe('thirdPartyDeveloperTools', () => {it('disposes old handles when executing third party developer tools', async () => {await withMcpContext(- async (response, context) => {- await setupThirdPartyDeveloperTools(response, context, () => {+ async (response, context, args) => {+ await setupThirdPartyDeveloperTools(response, context, args, () => {const mockToolGroup = {name: 'test-group',description: 'test description',@@ -918,7 +920,7 @@ describe('thirdPartyDeveloperTools', () => {assert.fail('No page found');}- await executeThirdPartyDeveloperTool.handler(+ await executeThirdPartyDeveloperTool(args).handler({params: {toolName: 'test-tool',@@ -935,7 +937,7 @@ describe('thirdPartyDeveloperTools', () => {// @ts-expect-error Internal Puppeteer APIassert.ok(!firstHandles[0].disposed);- await executeThirdPartyDeveloperTool.handler(+ await executeThirdPartyDeveloperTool(args).handler({params: {toolName: 'test-tool',diff --git a/tests/tools/webmcp.test.ts b/tests/tools/webmcp.test.tsindex 2e34ff4d..fb0659dc 100644--- a/tests/tools/webmcp.test.ts+++ b/tests/tools/webmcp.test.ts@@ -15,8 +15,8 @@ import {html, withMcpContext} from '../utils.js';describe('webmcp', () => {describe('list_webmcp_tools', () => {it('list webmcp tools in navigate_page response', async () => {- await withMcpContext(async (response, context) => {- await navigatePage().handler(+ await withMcpContext(async (response, context, args) => {+ await navigatePage(args).handler({params: {url: 'data:text/html,<html></html>'},page: context.getSelectedMcpPage(),@@ -29,16 +29,16 @@ describe('webmcp', () => {});it('list webmcp tools in list_pages response', async () => {- await withMcpContext(async (response, context) => {- await listPages().handler({params: {}}, response, context);+ await withMcpContext(async (response, context, args) => {+ await listPages(args).handler({params: {}}, response, context);assert.ok(response.listWebMcpTools);});});it('list webmcp tools in select_page response', async () => {- await withMcpContext(async (response, context) => {+ await withMcpContext(async (response, context, args) => {const pageId = context.getSelectedMcpPage().id ?? 1;- await selectPage.handler({params: {pageId}}, response, context);+ await selectPage(args).handler({params: {pageId}}, response, context);assert.ok(response.listWebMcpTools);});});@@ -63,7 +63,7 @@ describe('webmcp', () => {it('executes a tool successfully', async () => {await withMcpContext(- async (response, context) => {+ async (response, context, args) => {const page = context.getSelectedMcpPage();const toolsAddedPromise = new Promise(resolve => {page.pptrPage.webmcp.once('toolsadded', resolve);@@ -73,7 +73,7 @@ describe('webmcp', () => {// Wait for WebMCP tools to be registered and detected by Puppeteerawait toolsAddedPromise;- await executeWebMcpTool.handler(+ await executeWebMcpTool(args).handler({params: {toolName: 'test_tool', input: JSON.stringify({})}, page},response,context,@@ -90,10 +90,10 @@ describe('webmcp', () => {it('throws if tool is not found', async () => {await withMcpContext(- async (response, context) => {+ async (response, context, args) => {await assert.rejects(async () => {- await executeWebMcpTool.handler(+ await executeWebMcpTool(args).handler({params: {toolName: 'missing-tool', input: JSON.stringify({})},page: context.getSelectedMcpPage(),@@ -112,13 +112,13 @@ describe('webmcp', () => {it('throws if input is invalid', async () => {await withMcpContext(- async (response, context) => {+ async (response, context, args) => {await assert.rejects(async () => {const page = context.getSelectedMcpPage();await setupWebMcpTool(page);- await executeWebMcpTool.handler(+ await executeWebMcpTool(args).handler({params: {toolName: 'test_tool', input: 'invalid'}, page},response,context,diff --git a/tests/utils.ts b/tests/utils.tsindex d3be93a8..de590699 100644--- a/tests/utils.ts+++ b/tests/utils.ts@@ -29,7 +29,11 @@ import {TextSnapshot} from '../src/TextSnapshot.js';import {DevTools} from '../src/third_party/index.js';import {stableIdSymbol} from '../src/utils/id.js';-import {createMockPuppeteerPage, mockListener} from './mocks.js';+import {+ createMockParsedArguments,+ createMockPuppeteerPage,+ mockListener,+} from './mocks.js';export function assertNoServiceWorkerReported(targets: Target[], id: string) {const target = targets.find(target => {@@ -156,7 +160,11 @@ export async function withBrowser(}export async function withMcpContext(- cb: (response: McpResponse, context: McpContext) => Promise<void>,+ cb: (+ response: McpResponse,+ context: McpContext,+ args: ParsedArguments,+ ) => Promise<void>,options: {debug?: boolean;autoOpenDevTools?: boolean;@@ -174,7 +182,8 @@ export async function withMcpContext(await withBrowser(async browser => {TextSnapshot.resetCounter();McpContext.resetPageIdsForTesting();- const response = new McpResponse(args as ParsedArguments);+ const parsedArgs = createMockParsedArguments(args);+ const response = new McpResponse(parsedArgs);if (context) {context.dispose();}@@ -191,14 +200,14 @@ export async function withMcpContext(navigationTimeout:options.navigationTimeout ??(process.platform === 'win32' ? 20000 : undefined),- categoryExtensions: args?.categoryExtensions,+ categoryExtensions: parsedArgs.categoryExtensions,},Locator,);response.setPage(context.getSelectedMcpPage());- await cb(response, context);+ await cb(response, context, parsedArgs);}, options);}