Skip to content

Chrome DevTools for coding agents

chore: re-use connection adapter and dispose devtools unvierse (#2465)

Alex Rudenko830f78b8ce19
diff --git a/AGENTS.md b/AGENTS.md
index 654a1e13..260ccfec 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -7,6 +7,7 @@ This repository contains an MCP server and CLI for Chrome DevTools.
- Use `npm run test` to build and run tests, run all tests to verify correctness.
- Use `npm run test path-to-test.ts` to build and run a single test file, for example, `npm run test tests/McpContext.test.ts`.
- Use `npm run format` to fix formatting and get linting errors.
+- Never modify `devtools-frontend` except for experimentation: it is a git submodule, a mirror of the actual codebase.
## Rules for TypeScript
diff --git a/src/McpPage.ts b/src/McpPage.ts
index 3ed0b7c6..60992190 100644
--- a/src/McpPage.ts
+++ b/src/McpPage.ts
@@ -429,6 +429,12 @@ export class McpPage implements ContextPage {
this.pptrPage.off('dialog', this.#dialogHandler);
this.networkCollector.dispose();
this.consoleCollector.dispose();
+ const devtoolsUniverse = this.#devtoolsUniverse;
+ this.#devtoolsUniverse = undefined;
+ devtoolsUniverse?.universe.dispose();
+ void devtoolsUniverse?.session.detach().catch(e => {
+ logger?.('Failed to detach DevTools session', e);
+ });
}
async executeThirdPartyDeveloperTool(
diff --git a/src/devtools/DevToolsConnectionAdapter.ts b/src/devtools/DevToolsConnectionAdapter.ts
deleted file mode 100644
index 3c8969f2..00000000
--- a/src/devtools/DevToolsConnectionAdapter.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import type * as puppeteer from '../third_party/index.js';
-import type {DevTools} from '../third_party/index.js';
-import {CDPSessionEvent} from '../third_party/index.js';
-
-/**
- * This class makes a puppeteer connection look like DevTools CDPConnection.
- *
- * Since we connect "root" DevTools targets to specific pages, we scope everything to a puppeteer CDP session.
- *
- * We don't have to recursively listen for 'sessionattached' as the "root" CDP session sees all child session attached
- * events, regardless how deeply nested they are.
- */
-export class PuppeteerDevToolsConnection
- implements DevTools.CDPConnection.CDPConnection
-{
- readonly #connection: puppeteer.Connection;
- readonly #observers = new Set<DevTools.CDPConnection.CDPConnectionObserver>();
- readonly #sessionEventHandlers = new Map<
- string,
- puppeteer.Handler<unknown>
- >();
-
- constructor(session: puppeteer.CDPSession) {
- this.#connection = session.connection()!;
-
- session.on(
- CDPSessionEvent.SessionAttached,
- this.#startForwardingCdpEvents.bind(this),
- );
- session.on(
- CDPSessionEvent.SessionDetached,
- this.#stopForwardingCdpEvents.bind(this),
- );
-
- this.#startForwardingCdpEvents(session);
- }
-
- send<T extends DevTools.CDPConnection.Command>(
- method: T,
- params: DevTools.CDPConnection.CommandParams<T>,
- sessionId: string | undefined,
- ): Promise<
- | {result: DevTools.CDPConnection.CommandResult<T>}
- | {error: DevTools.CDPConnection.CDPError}
- > {
- if (sessionId === undefined) {
- throw new Error(
- 'Attempting to send on the root session. This must not happen',
- );
- }
- const session = this.#connection.session(sessionId);
- if (!session) {
- // A session can go away while commands for it are still in flight, for
- // example when a page is closed while its source maps are loading. That
- // is normal, so report it the same way a failed command is reported.
- // Throwing here would escape synchronously out of a method declared to
- // return a promise, past the generated agent code, and end the process.
- return Promise.resolve({
- error: {
- code: -32000,
- message: 'Unknown session ' + sessionId,
- } as DevTools.CDPConnection.CDPError,
- });
- }
- // Rolled protocol version between puppeteer and DevTools doesn't necessarily match
- /* eslint-disable @typescript-eslint/no-explicit-any */
- return session
- .send(method as any, params)
- .then(result => ({result}))
- .catch(error => ({error})) as any;
- /* eslint-enable @typescript-eslint/no-explicit-any */
- }
-
- observe(observer: DevTools.CDPConnection.CDPConnectionObserver): void {
- this.#observers.add(observer);
- }
-
- unobserve(observer: DevTools.CDPConnection.CDPConnectionObserver): void {
- this.#observers.delete(observer);
- }
-
- #startForwardingCdpEvents(session: puppeteer.CDPSession): void {
- const handler = this.#handleEvent.bind(
- this,
- session.id(),
- ) as puppeteer.Handler<unknown>;
- this.#sessionEventHandlers.set(session.id(), handler);
- session.on('*', handler);
- }
-
- #stopForwardingCdpEvents(session: puppeteer.CDPSession): void {
- const handler = this.#sessionEventHandlers.get(session.id());
- if (handler) {
- session.off('*', handler);
- }
- }
-
- #handleEvent(
- sessionId: string,
- type: string | symbol | number,
- event: any, // eslint-disable-line @typescript-eslint/no-explicit-any
- ): void {
- if (
- typeof type === 'string' &&
- type !== CDPSessionEvent.SessionAttached &&
- type !== CDPSessionEvent.SessionDetached
- ) {
- this.#observers.forEach(observer =>
- observer.onEvent({
- method: type as DevTools.CDPConnection.Event,
- sessionId,
- params: event,
- }),
- );
- }
- }
-}
diff --git a/src/devtools/DevtoolsUtils.ts b/src/devtools/DevtoolsUtils.ts
index 606ca378..4c21c802 100644
--- a/src/devtools/DevtoolsUtils.ts
+++ b/src/devtools/DevtoolsUtils.ts
@@ -11,7 +11,6 @@ import type {
Protocol,
} from '../third_party/index.js';
-import {PuppeteerDevToolsConnection} from './DevToolsConnectionAdapter.js';
import {McpHostBindingAdapter} from './McpHostBindingAdapter.js';
/**
@@ -151,7 +150,8 @@ export async function createTargetUniverse(
supportsEmulation: false,
});
- const connection = new PuppeteerDevToolsConnection(session);
+ // @ts-expect-error devtools-frontend has diffrent types.
+ const connection = new DevTools.PuppeteerDevToolsConnection(session);
const targetManager = universe.context.get(DevTools.TargetManager);
diff --git a/tests/devtools/DevToolsConnectionAdapter.test.ts b/tests/devtools/DevToolsConnectionAdapter.test.ts
deleted file mode 100644
index 875463e7..00000000
--- a/tests/devtools/DevToolsConnectionAdapter.test.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import assert from 'node:assert';
-import {describe, it} from 'node:test';
-
-import {PuppeteerDevToolsConnection} from '../../src/devtools/DevToolsConnectionAdapter.js';
-import type {CDPSession} from '../../src/third_party/index.js';
-import {mockListener} from '../utils.js';
-
-function getMockSession(sessionsById: Record<string, unknown>): CDPSession {
- const connection = {
- session(id: string) {
- return sessionsById[id];
- },
- };
- return {
- ...mockListener(),
- id() {
- return 'root-session';
- },
- connection() {
- return connection;
- },
- } as unknown as CDPSession;
-}
-
-describe('PuppeteerDevToolsConnection', () => {
- it('reports an unknown session as an error instead of throwing', async () => {
- const session = getMockSession({'root-session': {}});
- const connection = new PuppeteerDevToolsConnection(session);
-
- // The page this session belonged to is gone, which is what happens when a
- // tab closes while commands for it are still in flight.
- const response = await connection.send(
- 'Network.loadNetworkResource' as never,
- {} as never,
- 'session-that-went-away',
- );
-
- assert.ok('error' in response, 'expected an error response');
- assert.match(response.error.message, /Unknown session/);
- });
-
- it('forwards commands to the session it belongs to', async () => {
- const calls: string[] = [];
- const target = {
- send(method: string) {
- calls.push(method);
- return Promise.resolve({ok: true});
- },
- };
- const session = getMockSession({'a-session': target});
- const connection = new PuppeteerDevToolsConnection(session);
-
- const response = await connection.send(
- 'Page.enable' as never,
- {} as never,
- 'a-session',
- );
-
- assert.deepStrictEqual(calls, ['Page.enable']);
- assert.deepStrictEqual(response, {result: {ok: true}});
- });
-});
diff --git a/tsconfig.json b/tsconfig.json
index 8f8b5d2b..923f5ed7 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -36,6 +36,7 @@
"devtools-frontend/front_end/core/protocol_client/ConnectionTransport.ts",
"devtools-frontend/front_end/core/protocol_client/DevToolsCDPConnection.ts",
"devtools-frontend/front_end/core/protocol_client/InspectorBackend.ts",
+ "devtools-frontend/front_end/core/protocol_client/PuppeteerDevToolsConnection.ts",
"devtools-frontend/front_end/core/protocol_client/protocol_client.ts",
"devtools-frontend/front_end/core/root",
"devtools-frontend/front_end/core/sdk",
@@ -99,8 +100,7 @@
"devtools-frontend/front_end/third_party/puppeteer/**",
"devtools-frontend/front_end/third_party/puppeteer-legacy/**",
"devtools-frontend/front_end/panels/recorder/**",
- "devtools-frontend/front_end/services/puppeteer/**",
- "devtools-frontend/front_end/core/protocol_client/PuppeteerDevToolsConnection.ts"
+ "devtools-frontend/front_end/services/puppeteer/**"
],
"files": [
"devtools-frontend/front_end/third_party/acorn/package/dist/acorn.mjs"