opera-devtools-mcp 0.2.2 → 0.2.4

package/build/src/index.js

@@ -5,7 +5,7 @@
  *
  * Modified by Opera Software AS.
  */
-import { closeBrowserIfOpen, ensureBrowserConnected, ensureBrowserLaunched, getCurrentBrowser } from './browser.js';
+import { closeBrowserIfOpen, ensureBrowserConnected, ensureBrowserLaunched, getCurrentBrowser, } from './browser.js';
 import { loadIssueDescriptions } from './issue-descriptions.js';
 import { logger } from './logger.js';
 import { McpContext } from './McpContext.js';
@@ -200,7 +200,8 @@ export async function createMcpServer(serverArgs, options) {
                 const needsOperaFlags = tool.name === 'opera_do' || tool.name === 'opera_research';
                 const browserConnected = getCurrentBrowser()?.connected ?? false;
                 if (isLaunchMode) {
-                    if (needsOperaFlags && !(browserHasOperaFlags && browserConnected)) {
+                    if (needsOperaFlags &&
+                        !(browserHasOperaFlags && browserConnected)) {
                         await restartBrowserForOpera();
                     }
                     else if (!needsOperaFlags &&
@@ -220,37 +221,52 @@ export async function createMcpServer(serverArgs, options) {
                     // VS Code, etc.) continue to render it as readable text.
                     void extra.sendNotification({
                         method: 'notifications/message',
-                        params: { level: 'info', data: message, logger: String(extra.requestId) },
+                        params: {
+                            level: 'info',
+                            data: message,
+                            logger: String(extra.requestId),
+                        },
                     });
                 };
                 const response = serverArgs.slim
                     ? new SlimMcpResponse(serverArgs, logCallback)
                     : new McpResponse(serverArgs, logCallback);
-                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,
-                        signal: extra.signal,
-                    }, response, context);
+                try {
+                    if ('pageScoped' in tool && tool.pageScoped) {
+                        const page = serverArgs.experimentalPageIdRouting &&
+                            params.pageId &&
+                            !serverArgs.slim
+                            ? context.getPageById(params.pageId)
+                            : context.getSelectedMcpPage();
+                        response.setPage(page);
+                        if (tool.blockedByDialog) {
+                            page.throwIfDialogOpen();
+                        }
+                        await tool.handler({
+                            params,
+                            page,
+                            signal: extra.signal,
+                        }, response, context);
+                    }
+                    else {
+                        await tool.handler(
+                        // @ts-expect-error types do not match.
+                        {
+                            params,
+                            signal: extra.signal,
+                        }, response, context);
+                    }
                 }
-                else {
-                    await tool.handler(
-                    // @ts-expect-error types do not match.
-                    {
-                        params,
-                        signal: extra.signal,
-                    }, response, context);
+                catch (err) {
+                    response.setError(err);
                 }
                 const { content, structuredContent } = await response.handle(tool.name, context);
                 const result = {
                     content,
                 };
+                if (response.error) {
+                    result.isError = true;
+                }
                 success = true;
                 if (serverArgs.experimentalStructuredContent) {
                     result.structuredContent = structuredContent;