chore: reverting evaluateScript to use defineTool

Author: nroscino

src/McpContext.ts

@@ -34,6 +34,7 @@ import type {
 } from './third_party/index.js';
 import {Locator} from './third_party/index.js';
 import {PredefinedNetworkConditions} from './third_party/index.js';
+import {listPages} from './tools/pages.js';
 import {CLOSE_PAGE_ERROR} from './tools/ToolDefinition.js';
 import type {Context, DevToolsData} from './tools/ToolDefinition.js';
 import type {TraceResult} from './trace-processing/parse.js';
@@ -508,7 +509,7 @@ export class McpContext implements Context {
     }
     if (page.isClosed()) {
       throw new Error(
-        `The selected page has been closed. Call list_pages to see open pages.`,
+        `The selected page has been closed. Call ${listPages().name} to see open pages.`,
       );
     }
     return page;

src/tools/ToolDefinition.ts

@@ -142,6 +142,7 @@ export type Context = Readonly<{
   getDialog(page?: Page): Dialog | undefined;
   clearDialog(page?: Page): void;
   getPageById(pageId: number): Page;
+  resolvePageById(pageId?: number): Page;
   newPage(background?: boolean, isolatedContextName?: string): Promise<Page>;
   closePage(pageId: number): Promise<void>;
   selectPage(page: Page): void;

src/tools/script.ts

@@ -10,11 +10,11 @@ import type {Frame, JSHandle, Page, WebWorker} from '../third_party/index.js';
 
 import {ToolCategory} from './categories.js';
 import type {Context} from './ToolDefinition.js';
-import {definePageTool} from './ToolDefinition.js';
+import {defineTool, pageIdSchema} from './ToolDefinition.js';
 
 export type Evaluatable = Page | Frame | WebWorker;
 
-export const evaluateScript = definePageTool(cliArgs => {
+export const evaluateScript = defineTool(cliArgs => {
   return {
     name: 'evaluate_script',
     description: `Evaluate a JavaScript function inside the currently selected page. Returns the response as JSON,
@@ -48,6 +48,7 @@ Example with arguments: \`(el) => {
         )
         .optional()
         .describe(`An optional list of arguments to pass to the function.`),
+      ...(cliArgs?.experimentalPageIdRouting ? pageIdSchema : {}),
       ...(cliArgs?.categoryExtensions
         ? {
             serviceWorkerId: zod
@@ -60,17 +61,22 @@ Example with arguments: \`(el) => {
         : {}),
     },
     handler: async (request, response, context) => {
+      const page: Page = cliArgs?.experimentalPageIdRouting
+        ? context.resolvePageById(request.params.pageId)
+        : context.getSelectedPage();
+
       const args: Array<JSHandle<unknown>> = [];
       try {
         const frames = new Set<Frame>();
         for (const el of request.params.args ?? []) {
-          const handle = await context.getElementByUid(el.uid, request.page);
+          const handle = await context.getElementByUid(el.uid, page);
           frames.add(handle.frame);
           args.push(handle);
         }
 
         const evaluatable = await getEvaluatable(
           context,
+          page,
           frames,
           cliArgs?.categoryExtensions,
           request.params.serviceWorkerId as string | undefined,
@@ -103,18 +109,20 @@ Example with arguments: \`(el) => {
 
 const getEvaluatable = async (
   context: Context,
+  page: Page,
   frames: Set<Frame>,
   enableExtensions?: boolean,
   serviceWorkerId?: string,
 ): Promise<Evaluatable> => {
   if (enableExtensions && serviceWorkerId) {
     return getWebWorker(context, serviceWorkerId);
   }
-  return getPageOrFrame(context, frames);
+  return getPageOrFrame(context, page, frames);
 };
 
 const getPageOrFrame = async (
   context: Context,
+  page: Page,
   frames: Set<Frame>,
 ): Promise<Page | Frame> => {
   let pageOrFrame: Page | Frame;
@@ -124,7 +132,7 @@ const getPageOrFrame = async (
       "Elements from different frames can't be evaluated together.",
     );
   } else {
-    pageOrFrame = [...frames.values()][0] ?? context.getSelectedPage();
+    pageOrFrame = [...frames.values()][0] ?? page;
   }
 
   return pageOrFrame;

tests/tools/script.test.ts

@@ -30,7 +30,6 @@ describe('script', () => {
         await evaluateScript().handler(
           {
             params: {function: String(() => 2 * 5)},
-            page: context.getSelectedPage(),
           },
           response,
           context,
@@ -44,7 +43,6 @@ describe('script', () => {
         await evaluateScript().handler(
           {
             params: {function: String(() => document.title)},
-            page: context.getSelectedPage(),
           },
           response,
           context,
@@ -64,7 +62,6 @@ describe('script', () => {
         await evaluateScript().handler(
           {
             params: {function: String(() => document.title)},
-            page: context.getSelectedPage(),
           },
           response,
           context,
@@ -92,7 +89,6 @@ describe('script', () => {
                 return {scripts};
               }),
             },
-            page: context.getSelectedPage(),
           },
           response,
           context,
@@ -118,7 +114,6 @@ describe('script', () => {
                 return 'Works';
               }),
             },
-            page: context.getSelectedPage(),
           },
           response,
           context,
@@ -144,7 +139,6 @@ describe('script', () => {
               }),
               args: [{uid: '1_1'}],
             },
-            page: context.getSelectedPage(),
           },
           response,
           context,
@@ -170,7 +164,6 @@ describe('script', () => {
               }),
               args: [{uid: '1_0'}, {uid: '1_1'}],
             },
-            page: context.getSelectedPage(),
           },
           response,
           context,
@@ -199,7 +192,6 @@ describe('script', () => {
               }),
               args: [{uid: '1_3'}],
             },
-            page: context.getSelectedPage(),
           },
           response,
           context,
@@ -243,7 +235,6 @@ describe('script', () => {
                 }),
                 serviceWorkerId: swId,
               },
-              page: context.getSelectedPage(),
             },
             response,
             context,