chore: make changes

Author: OrKoN

docs/tool-reference.md

@@ -157,7 +157,7 @@
 
 - **handleBeforeUnload** (enum: "accept", "decline") _(optional)_: Whether to auto accept or beforeunload dialogs triggered by this navigation. Default is accept.
 - **ignoreCache** (boolean) _(optional)_: Whether to ignore cache on reload.
-- **initScript** (string) _(optional)_: (optional) A JavaScript function to be executed by the tool on new document for every page load before any other scripts.
+- **initScript** (string) _(optional)_: A JavaScript script to be executed on each new document before any other scripts for the next navigation.
 - **timeout** (integer) _(optional)_: Maximum wait time in milliseconds. If set to 0, the default timeout will be used.
 - **type** (enum: "url", "back", "forward", "reload") _(optional)_: Navigate the page by URL, back or forward in history, or reload.
 - **url** (string) _(optional)_: Target URL (only type=url)

src/tools/pages.ts

@@ -133,14 +133,11 @@ export const navigatePage = defineTool({
       .describe(
         'Whether to auto accept or beforeunload dialogs triggered by this navigation. Default is accept.',
       ),
-    initScript: zod.string().optional().describe(
-      `(optional) A JavaScript function to be executed by the tool on new document for every page load before any other scripts.
-      `),
     initScript: zod
       .string()
       .optional()
       .describe(
-        '(optional) A JavaScript function to be executed by the tool on new document for every page load before any other scripts.',
+        'A JavaScript script to be executed on each new document before any other scripts for the next navigation.',
       ),
     ...timeoutSchema,
   },
@@ -170,70 +167,17 @@ export const navigatePage = defineTool({
         }
         // We are not going to report the dialog like regular dialogs.
         context.clearDialog();
-    if (request.params.initScript) {
-      await page.evaluateOnNewDocument(request.params.initScript);
-    }
-
-    await context.waitForEventsAfterAction(async () => {
-      switch (request.params.type) {
-        case 'url':
-          if (!request.params.url) {
-            throw new Error('A URL is required for navigation of type=url.');
-          }
-          try {
-            await page.goto(request.params.url, options);
-            response.appendResponseLine(
-              `Successfully navigated to ${request.params.url}.`,
-            );
-          } catch (error) {
-            response.appendResponseLine(
-              `Unable to navigate in the  selected page: ${error.message}.`,
-            );
-          }
-          break;
-        case 'back':
-          try {
-            await page.goBack(options);
-            response.appendResponseLine(
-              `Successfully navigated back to ${page.url()}.`,
-            );
-          } catch (error) {
-            response.appendResponseLine(
-              `Unable to navigate back in the selected page: ${error.message}.`,
-            );
-          }
-          break;
-        case 'forward':
-          try {
-            await page.goForward(options);
-            response.appendResponseLine(
-              `Successfully navigated forward to ${page.url()}.`,
-            );
-          } catch (error) {
-            response.appendResponseLine(
-              `Unable to navigate forward in the selected page: ${error.message}.`,
-            );
-          }
-          break;
-        case 'reload':
-          try {
-            await page.reload({
-              ...options,
-              ignoreCache: request.params.ignoreCache,
-            });
-            response.appendResponseLine(`Successfully reloaded the page.`);
-          } catch (error) {
-            response.appendResponseLine(
-              `Unable to reload the selected page: ${error.message}.`,
-            );
-          }
-          break;
       }
-    });
+    };
 
+    let initScriptId: string | undefined;
     if (request.params.initScript) {
-      await page.evaluateOnNewDocument(request.params.initScript);
+      const {identifier} = await page.evaluateOnNewDocument(
+        request.params.initScript,
+      );
+      initScriptId = identifier;
     }
+
     page.on('dialog', dialogHandler);
 
     try {
@@ -295,6 +239,13 @@ export const navigatePage = defineTool({
       });
     } finally {
       page.off('dialog', dialogHandler);
+      if (initScriptId) {
+        await page
+          .removeScriptToEvaluateOnNewDocument(initScriptId)
+          .catch(error => {
+            logger(`Failed to remove init script`, error);
+          });
+      }
     }
 
     response.setIncludePages(true);

tests/tools/pages.test.ts

@@ -298,7 +298,7 @@ describe('pages', () => {
       });
     });
     it('navigates to correct page with initScript', async () => {
-      await withBrowser(async (response, context) => {
+      await withMcpContext(async (response, context) => {
         await navigatePage.handler(
           {
             params: {