Chrome DevTools for coding agents
fix: close the tab opened by a failed new_page (#2928)
Serhii Zghamac174677cf6c4
diff --git a/src/tools/ToolDefinition.ts b/src/tools/ToolDefinition.tsindex b2abf013..97feefe3 100644--- a/src/tools/ToolDefinition.ts+++ b/src/tools/ToolDefinition.ts@@ -476,6 +476,7 @@ export type MatchedStyles = DevTools.CSSMatchedStyles.CSSMatchedStyles;* Only add methods used by tools/*.*/export type ContextPage = Readonly<{+ readonly id: number;readonly pptrPage: Page;readonly cpuThrottlingRate: number;readonly networkConditions: string | null;@@ -497,6 +498,7 @@ export type ContextPage = Readonly<{getDialog(): Dialog | undefined;clearDialog(): void;throwIfDialogOpen(): void;+ isClosed(): boolean;getScreenRecorder(): ScreenRecorderData | null;setScreenRecorder(data: ScreenRecorderData | null): void;setIsRunningPerformanceTrace(x: boolean): void;diff --git a/src/tools/pages.ts b/src/tools/pages.tsindex e6ab93f8..1f1b49fe 100644--- a/src/tools/pages.ts+++ b/src/tools/pages.ts@@ -17,6 +17,7 @@ import {defineTool,timeoutSchema,} from './ToolDefinition.js';+import type {ContextPage} from './ToolDefinition.js';export const listPages = defineTool((args: ParsedArguments) => {return {@@ -138,19 +139,48 @@ export const newPage = defineTool((args: ParsedArguments) => {fileNavigations: args?.fileNavigations,});+ let previousPage: ContextPage | undefined;+ try {+ previousPage = context.getSelectedMcpPage();+ } catch {+ // Nothing is selected, so there is no selection to restore on failure.+ }const page = await context.newPage(request.params.background,request.params.isolatedContext,);- await page.waitForEventsAfterAction(- async () => {- await page.pptrPage.goto(request.params.url, {- timeout: request.params.timeout,- });- },- {timeout: request.params.timeout},- );+ try {+ await page.waitForEventsAfterAction(+ async () => {+ await page.pptrPage.goto(request.params.url, {+ timeout: request.params.timeout,+ });+ },+ {timeout: request.params.timeout},+ );+ } catch (error) {+ // A dialog-blocked load stays open for handle_dialog. Otherwise cleanup is+ // best-effort: the navigation error is always what gets rethrown.+ if (page.getDialog()) {+ response.setIncludePages(true);+ } else {+ try {+ if (previousPage && !previousPage.isClosed()) {+ context.selectPage(previousPage);+ }+ } catch {+ // Keep the new tab selected.+ }+ try {+ await context.closePage(page.id);+ } catch {+ // The tab survived, so list pages to tell the caller its pageId.+ response.setIncludePages(true);+ }+ }+ throw error;+ }response.setIncludePages(true);response.setListThirdPartyDeveloperTools();diff --git a/tests/tools/pages.test.ts b/tests/tools/pages.test.tsindex 16552f19..c02bcc0b 100644--- a/tests/tools/pages.test.ts+++ b/tests/tools/pages.test.ts@@ -22,7 +22,12 @@ import {getTabId,} from '../../src/tools/pages.js';import {zod} from '../../src/third_party/index.js';-import {createHandlerMocks, createMockParsedArguments} from '../mocks.js';+import {+ createHandlerMocks,+ createMockDialog,+ createMockMcpPage,+ createMockParsedArguments,+} from '../mocks.js';import {assertNoServiceWorkerReported, html, withMcpContext} from '../utils.js';const EXTENSION_SW_PATH = path.join(@@ -250,6 +255,79 @@ describe('pages', () => {response.setListThirdPartyDeveloperTools,);});+ it('closes the new tab and restores the selection when navigation fails', async () => {+ const {+ page: previousPage,+ context,+ response,+ args,+ } = createHandlerMocks();+ const page = createMockMcpPage();+ Object.defineProperty(page, 'id', {value: 2});+ context.newPage.resolves(page);+ const error = new Error('net::ERR_CONNECTION_REFUSED');+ page.pptrPage.goto.rejects(error);++ await assert.rejects(+ newPage(args).handler(+ {params: {url: 'https://example.com'}},+ response,+ context,+ ),+ error,+ );++ sinon.assert.calledOnceWithExactly(context.selectPage, previousPage);+ sinon.assert.calledOnceWithExactly(context.closePage, 2);+ sinon.assert.notCalled(response.setIncludePages);+ });+ it('rethrows the navigation error and lists pages when closing the tab fails', async () => {+ const {+ page: previousPage,+ context,+ response,+ args,+ } = createHandlerMocks();+ const page = createMockMcpPage();+ Object.defineProperty(page, 'id', {value: 2});+ context.newPage.resolves(page);+ const error = new Error('net::ERR_CONNECTION_REFUSED');+ page.pptrPage.goto.rejects(error);+ context.closePage.rejects(new Error('No page found'));++ await assert.rejects(+ newPage(args).handler(+ {params: {url: 'https://example.com'}},+ response,+ context,+ ),+ error,+ );++ sinon.assert.calledOnceWithExactly(context.selectPage, previousPage);+ sinon.assert.calledOnceWithExactly(response.setIncludePages, true);+ });+ it('keeps a dialog-blocked tab open and lists pages', async () => {+ const {context, response, args} = createHandlerMocks();+ const page = createMockMcpPage();+ context.newPage.resolves(page);+ const error = new Error('Navigation timeout of 1000 ms exceeded');+ page.pptrPage.goto.rejects(error);+ page.getDialog.returns(createMockDialog({message: 'blocked'}));++ await assert.rejects(+ newPage(args).handler(+ {params: {url: 'https://example.com', timeout: 1000}},+ response,+ context,+ ),+ error,+ );++ sinon.assert.notCalled(context.selectPage);+ sinon.assert.notCalled(context.closePage);+ sinon.assert.calledOnceWithExactly(response.setIncludePages, true);+ });it('create a page', async () => {await withMcpContext(async (response, context, args) => {assert.strictEqual(