chore: rebase conflicts

Author: nroscino

src/tools/ToolDefinition.ts

@@ -141,7 +141,6 @@ export type Context = Readonly<{
   recordedTraces(): TraceResult[];
   storeTraceRecording(result: TraceResult): void;
   getPageById(pageId: number): ContextPage;
-  resolvePageById(pageId?: number): ContextPage;
   newPage(
     background?: boolean,
     isolatedContextName?: string,

src/tools/script.ts

@@ -84,15 +84,15 @@ Example with arguments: \`(el) => {
       }
 
       const mcpPage = cliArgs?.experimentalPageIdRouting
-        ? context.resolvePageById(request.params.pageId)
+        ? context.getPageById(request.params.pageId)
         : context.getSelectedMcpPage();
       const page: Page = mcpPage.pptrPage;
 
       const args: Array<JSHandle<unknown>> = [];
       try {
         const frames = new Set<Frame>();
         for (const el of uidArgs ?? []) {
-          const handle = await context.getElementByUid(el.uid, page);
+          const handle = await mcpPage.getElementByUid(el.uid);
           frames.add(handle.frame);
           args.push(handle);
         }