Chrome DevTools for coding agents
fix: do not append page url when the previously selected page is gone. (#2588)
yulunz6506425a46ea
diff --git a/src/McpContext.ts b/src/McpContext.tsindex e667a21b..e1c0cab9 100644--- a/src/McpContext.ts+++ b/src/McpContext.ts@@ -413,6 +413,21 @@ export class McpContext implements Context {return page;}+ getSelectedMcpPageUrl(page?: McpPage): string | undefined {+ let targetPage = page;+ if (!targetPage) {+ try {+ targetPage = this.getSelectedMcpPage();+ } catch {+ return undefined;+ }+ }+ if (targetPage?.pptrPage?.isClosed() === false) {+ return targetPage.pptrPage.url();+ }+ return undefined;+ }+async getDevToolsData(page?: McpPage): Promise<DevToolsData | undefined> {const targetPage = page ?? this.#selectedPage;if (!targetPage) {diff --git a/src/ToolHandler.ts b/src/ToolHandler.tsindex a8acc9ce..d87e5e84 100644--- a/src/ToolHandler.ts+++ b/src/ToolHandler.ts@@ -341,10 +341,7 @@ export class ToolHandler {response.setError(err);}devToolsData = await context.getDevToolsData(page);- const targetPage = page ?? context.getSelectedMcpPage();- if (targetPage?.pptrPage?.isClosed() === false) {- pageUrl = targetPage.pptrPage.url();- }+ pageUrl = context.getSelectedMcpPageUrl(page);// Resolve data format: --experimentalDataFormat takes precedence, fall back to legacy --experimentalToonFormatlet dataFormat: DataFormat = 'default';if (this.serverArgs.experimentalDataFormat) {diff --git a/tests/McpContext.test.ts b/tests/McpContext.test.tsindex 865df86b..26b2dd28 100644--- a/tests/McpContext.test.ts+++ b/tests/McpContext.test.ts@@ -778,5 +778,52 @@ describe('McpContext', () => {});});});++ describe('getSelectedMcpPageUrl', () => {+ it('returns url from passed page when open', async () => {+ await withMcpContext(async (_response, context) => {+ const page = await context.newPage();+ const result = context.getSelectedMcpPageUrl(page);+ assert.strictEqual(result, page.pptrPage.url());+ });+ });++ it('returns undefined from passed page when closed', async () => {+ await withMcpContext(async (_response, context) => {+ const page = await context.newPage();+ await page.pptrPage.close();+ const result = context.getSelectedMcpPageUrl(page);+ assert.strictEqual(result, undefined);+ });+ });++ it('returns url from selected page when no page passed', async () => {+ await withMcpContext(async (_response, context) => {+ const page = context.getSelectedMcpPage();+ const result = context.getSelectedMcpPageUrl();+ assert.strictEqual(result, page.pptrPage.url());+ });+ });++ it('returns undefined when getSelectedMcpPage throws', async () => {+ await withMcpContext(async (_response, context) => {+ sinon+ .stub(context, 'getSelectedMcpPage')+ .throws(new Error('No page selected'));+ const result = context.getSelectedMcpPageUrl();+ assert.strictEqual(result, undefined);+ });+ });++ it('returns undefined when selected page is closed and getSelectedMcpPage throws', async () => {+ await withMcpContext(async (_response, context) => {+ const page = context.getSelectedMcpPage();+ await page.pptrPage.close();+ assert.throws(() => context.getSelectedMcpPage());+ const result = context.getSelectedMcpPageUrl();+ assert.strictEqual(result, undefined);+ });+ });+ });});});diff --git a/tests/ToolHandler.test.ts b/tests/ToolHandler.test.tsindex 42e4eb13..07492054 100644--- a/tests/ToolHandler.test.ts+++ b/tests/ToolHandler.test.ts@@ -112,7 +112,7 @@ describe('ToolHandler', () => {const result = await toolHandler.handle({});assert.strictEqual(mockContext.getDevToolsData.calledOnce, true);- assert.strictEqual(mockContext.getSelectedMcpPage.calledOnce, true);+ assert.strictEqual(mockContext.getSelectedMcpPageUrl.calledOnce, true);assert.strictEqual(mockContext.getPageById.called, false);assert.strictEqual(handlerCalled, true);assert.strictEqual(result.isError, undefined);@@ -180,13 +180,7 @@ describe('ToolHandler', () => {mockContext.browser = getMockBrowser({process: mockProcess});mockContext.getDevToolsData.resolves(testCase.devToolsData);if (testCase.pageUrl) {- const mockPage = {- pptrPage: {- isClosed: () => false,- url: () => testCase.pageUrl,- },- } as unknown as McpPage;- mockContext.getSelectedMcpPage.returns(mockPage);+ mockContext.getSelectedMcpPageUrl.returns(testCase.pageUrl);}const logSpy = sinon.spy();