Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions packages/playwright-core/src/tools/backend/devtools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,19 @@ const resume = defineTool({

handle: async (context, params, response) => {
const browserContext = await context.ensureBrowserContext();
const pausedPromise = new Promise<void>(resolve => {
const listener = () => {
if (browserContext.debugger.pausedDetails()) {
browserContext.debugger.off('pausedstatechanged', listener);
resolve();
}
};
browserContext.debugger.on('pausedstatechanged', listener);
});
const waitForPause = params.step || params.location;
let pausedPromise: Promise<void> | undefined;
if (waitForPause) {
pausedPromise = new Promise<void>(resolve => {
const listener = () => {
if (browserContext.debugger.pausedDetails()) {
browserContext.debugger.off('pausedstatechanged', listener);
resolve();
}
};
browserContext.debugger.on('pausedstatechanged', listener);
});
}

if (params.location) {
const [file, lineStr] = params.location.split(':');
Expand All @@ -67,7 +71,8 @@ const resume = defineTool({
} else {
await browserContext.debugger.resume();
}
await pausedPromise;
if (pausedPromise)
await pausedPromise;
},
});

Expand Down
21 changes: 21 additions & 0 deletions tests/mcp/devtools.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,27 @@ test('browser_hide_highlight', async ({ boundBrowser, startClient }) => {
await expect(page.locator('x-pw-highlight')).toHaveCount(0);
});

test('browser_resume completes without next breakpoint', async ({ boundBrowser, startClient }) => {
const page = await boundBrowser.newPage();
await page.setContent(`<button>Submit</button>`);
const context = boundBrowser.contexts()[0];

// Pause the debugger before the next action.
await context.debugger.requestPause();
const clickPromise = page.click('button');
await new Promise<void>(resolve => context.debugger.once('pausedstatechanged', resolve));
expect(context.debugger.pausedDetails()).toBeTruthy();

// browser_resume without step or location should return without
// waiting for a subsequent pause. Before the fix, this would hang
// indefinitely because no subsequent breakpoint exists.
const { client } = await startClient({ args: [`--endpoint=default`] });
await client.callTool({ name: 'browser_resume' });

await clickPromise;
expect(context.debugger.pausedDetails()).toBeNull();
});

test('browser_hide_highlight all', async ({ boundBrowser, startClient }) => {
const page = await boundBrowser.newPage();
await page.setContent(`<button>Submit</button><a href="#">Go</a>`);
Expand Down