add try catch block in index.ts to handle dialog

Author: samiyac

src/index.ts

@@ -226,31 +226,39 @@ export async function createMcpServer(
           logger(`${tool.name} request: ${JSON.stringify(params, null, '  ')}`);
           const context = await getContext();
           logger(`${tool.name} context: resolved`);
-          const page =
-            serverArgs.experimentalPageIdRouting &&
-            params.pageId &&
-            !serverArgs.slim
-              ? context.getPageById(params.pageId)
-              : context.getSelectedMcpPage();
-          // If there is a dialog open, we will skip devtools detection
-          if (!page.getDialog()) {
-            await context.detectOpenDevToolsWindows();
-          }
+          await context.detectOpenDevToolsWindows();
           const response = serverArgs.slim
             ? new SlimMcpResponse(serverArgs)
             : new McpResponse(serverArgs);
 
           response.setRedactNetworkHeaders(serverArgs.redactNetworkHeaders);
           if ('pageScoped' in tool && tool.pageScoped) {
+            const page =
+              serverArgs.experimentalPageIdRouting &&
+              params.pageId &&
+              !serverArgs.slim
+                ? context.getPageById(params.pageId)
+                : context.getSelectedMcpPage();
             response.setPage(page);
-            await tool.handler(
-              {
-                params,
-                page,
-              },
-              response,
-              context,
-            );
+            try {
+              await tool.handler(
+                {
+                  params,
+                  page,
+                },
+                response,
+                context,
+              );
+            } catch (error) {
+              const dialog = page.getDialog();
+              if (dialog) {
+                response.appendResponseLine(
+                  `[Blocked] Action triggered a dialog.`,
+                );
+              } else {
+                throw error;
+              }
+            }
           } else {
             await tool.handler(
               // @ts-expect-error types do not match.

src/tools/ToolDefinition.ts

@@ -348,18 +348,6 @@ export function definePageTool<
   return {
     ...definition,
     pageScoped: true,
-    handler: async (request, response, context) => {
-      try {
-        await definition.handler(request, response, context);
-      } catch (error) {
-        const dialog = request.page.getDialog();
-        if (dialog) {
-          response.appendResponseLine(`[Blocked] Action triggered a dialog.`);
-          return;
-        }
-        throw error;
-      }
-    },
   } as DefinedPageTool<Schema>;
 }