refactor: extract waitForEventsAfterAction out of performEvaluation

Service worker evaluation should not trigger DOM stability wait since
service workers don't interact with the page DOM. Move the
waitForEventsAfterAction call to the normal page evaluation path only,
removing the page parameter from performEvaluation.

Author: bcfmtolgahan

src/tools/script.ts

@@ -9,7 +9,7 @@ import type {Frame, JSHandle, Page, WebWorker} from '../third_party/index.js';
 import type {ExtensionServiceWorker} from '../types.js';
 
 import {ToolCategory} from './categories.js';
-import type {Context, ContextPage, Response} from './ToolDefinition.js';
+import type {Context, Response} from './ToolDefinition.js';
 import {defineTool, pageIdSchema} from './ToolDefinition.js';
 
 export type Evaluatable = Page | Frame | WebWorker;
@@ -77,7 +77,7 @@ Example with arguments: \`(el) => {
         }
 
         const worker = await getWebWorker(context, serviceWorkerId);
-        await performEvaluation(worker, fnString, [], response, context.getSelectedMcpPage());
+        await performEvaluation(worker, fnString, [], response);
         return;
       }
 
@@ -97,7 +97,9 @@ Example with arguments: \`(el) => {
 
         const evaluatable = await getPageOrFrame(page, frames);
 
-        await performEvaluation(evaluatable, fnString, args, response, mcpPage);
+        await mcpPage.waitForEventsAfterAction(async () => {
+          await performEvaluation(evaluatable, fnString, args, response);
+        });
       } finally {
         void Promise.allSettled(args.map(arg => arg.dispose()));
       }
@@ -110,24 +112,21 @@ const performEvaluation = async (
   fnString: string,
   args: Array<JSHandle<unknown>>,
   response: Response,
-  page: ContextPage,
 ) => {
   const fn = await evaluatable.evaluateHandle(`(${fnString})`);
   try {
-    await page.waitForEventsAfterAction(async () => {
-      const result = await evaluatable.evaluate(
-        async (fn, ...args) => {
-          // @ts-expect-error no types for function fn
-          return JSON.stringify(await fn(...args));
-        },
-        fn,
-        ...args,
-      );
-      response.appendResponseLine('Script ran on page and returned:');
-      response.appendResponseLine('```json');
-      response.appendResponseLine(`${result}`);
-      response.appendResponseLine('```');
-    });
+    const result = await evaluatable.evaluate(
+      async (fn, ...args) => {
+        // @ts-expect-error no types for function fn
+        return JSON.stringify(await fn(...args));
+      },
+      fn,
+      ...args,
+    );
+    response.appendResponseLine('Script ran on page and returned:');
+    response.appendResponseLine('```json');
+    response.appendResponseLine(`${result}`);
+    response.appendResponseLine('```');
   } finally {
     void fn.dispose();
   }