From 501d9864c0c25e377fb75d47b342ac924cb70c71 Mon Sep 17 00:00:00 2001
From: Dmitry Gozman <dgozman@gmail.com>
Date: Tue, 29 Jul 2025 13:02:43 +0100
Subject: [PATCH 1/9] chore: remove unused envs and protocol methods (#36825)

---
 .../playwright-core/src/protocol/validator.ts | 16 ----------
 .../src/server/debugController.ts             | 24 +--------------
 .../dispatchers/debugControllerDispatcher.ts  | 12 --------
 .../dispatchers/localUtilsDispatcher.ts       |  6 ----
 .../playwright-core/src/server/playwright.ts  |  4 ---
 .../src/utils/isomorphic/protocolMetainfo.ts  |  4 ---
 .../src/utils/isomorphic/urlMatch.ts          |  2 +-
 packages/playwright/src/runner/tasks.ts       |  2 +-
 packages/protocol/src/channels.d.ts           | 29 -------------------
 packages/protocol/src/protocol.yml            | 19 ------------
 tests/library/debug-controller.spec.ts        | 22 ++++----------
 11 files changed, 9 insertions(+), 131 deletions(-)

diff --git a/packages/playwright-core/src/protocol/validator.ts b/packages/playwright-core/src/protocol/validator.ts
index 865802398a037..ec4d1156e779b 100644
--- a/packages/playwright-core/src/protocol/validator.ts
+++ b/packages/playwright-core/src/protocol/validator.ts
@@ -358,14 +358,6 @@ scheme.LocalUtilsTraceDiscardedParams = tObject({
   stacksId: tString,
 });
 scheme.LocalUtilsTraceDiscardedResult = tOptional(tObject({}));
-scheme.LocalUtilsGlobToRegexParams = tObject({
-  glob: tString,
-  baseURL: tOptional(tString),
-  webSocketUrl: tOptional(tBoolean),
-});
-scheme.LocalUtilsGlobToRegexResult = tObject({
-  regex: tString,
-});
 scheme.RootInitializer = tOptional(tObject({}));
 scheme.RootInitializeParams = tObject({
   sdkLanguage: tType('SDKLanguage'),
@@ -464,12 +456,6 @@ scheme.DebugControllerSetReportStateChangedParams = tObject({
   enabled: tBoolean,
 });
 scheme.DebugControllerSetReportStateChangedResult = tOptional(tObject({}));
-scheme.DebugControllerResetForReuseParams = tOptional(tObject({}));
-scheme.DebugControllerResetForReuseResult = tOptional(tObject({}));
-scheme.DebugControllerNavigateParams = tObject({
-  url: tString,
-});
-scheme.DebugControllerNavigateResult = tOptional(tObject({}));
 scheme.DebugControllerSetRecorderModeParams = tObject({
   mode: tEnum(['inspecting', 'recording', 'none']),
   testIdAttributeName: tOptional(tString),
@@ -486,8 +472,6 @@ scheme.DebugControllerResumeParams = tOptional(tObject({}));
 scheme.DebugControllerResumeResult = tOptional(tObject({}));
 scheme.DebugControllerKillParams = tOptional(tObject({}));
 scheme.DebugControllerKillResult = tOptional(tObject({}));
-scheme.DebugControllerCloseAllBrowsersParams = tOptional(tObject({}));
-scheme.DebugControllerCloseAllBrowsersResult = tOptional(tObject({}));
 scheme.SocksSupportInitializer = tOptional(tObject({}));
 scheme.SocksSupportSocksRequestedEvent = tObject({
   uid: tString,
diff --git a/packages/playwright-core/src/server/debugController.ts b/packages/playwright-core/src/server/debugController.ts
index 0ddf54c8f17f4..89b133d99701b 100644
--- a/packages/playwright-core/src/server/debugController.ts
+++ b/packages/playwright-core/src/server/debugController.ts
@@ -26,7 +26,6 @@ import { collapseActions } from './recorder/recorderUtils';
 import { JavaScriptLanguageGenerator } from './codegen/javascript';
 
 import type { Language } from '../utils';
-import type { Browser } from './browser';
 import type { BrowserContext } from './browserContext';
 import type { InstrumentationListener } from './instrumentation';
 import type { Playwright } from './playwright';
@@ -74,19 +73,6 @@ export class DebugController extends SdkObject {
     }
   }
 
-  async resetForReuse(progress: Progress) {
-    const contexts = new Set<BrowserContext>();
-    for (const page of this._playwright.allPages())
-      contexts.add(page.browserContext);
-    for (const context of contexts)
-      await context.resetForReuse(progress, null);
-  }
-
-  async navigate(progress: Progress, url: string) {
-    for (const p of this._playwright.allPages())
-      await p.mainFrame().goto(progress, url);
-  }
-
   async setRecorderMode(progress: Progress, params: { mode: Mode, testIdAttributeName?: string }) {
     await progress.race(this._closeBrowsersWithoutPages());
 
@@ -137,11 +123,7 @@ export class DebugController extends SdkObject {
     for (const recorder of await progress.race(this._allRecorders()))
       recorder.hideHighlightedSelector();
     // Hide all locator.highlight highlights.
-    await this._playwright.hideHighlight();
-  }
-
-  allBrowsers(): Browser[] {
-    return [...this._playwright.allBrowsers()];
+    await Promise.all(this._playwright.allPages().map(p => p.hideHighlight().catch(() => {})));
   }
 
   async resume(progress: Progress) {
@@ -153,10 +135,6 @@ export class DebugController extends SdkObject {
     gracefullyProcessExitDoNotHang(0);
   }
 
-  async closeAllBrowsers() {
-    await Promise.all(this.allBrowsers().map(browser => browser.close({ reason: 'Close all browsers requested' })));
-  }
-
   private _emitSnapshot(initial: boolean) {
     const pageCount = this._playwright.allPages().length;
     if (initial && !pageCount)
diff --git a/packages/playwright-core/src/server/dispatchers/debugControllerDispatcher.ts b/packages/playwright-core/src/server/dispatchers/debugControllerDispatcher.ts
index cc55f9e28287a..595535925741f 100644
--- a/packages/playwright-core/src/server/dispatchers/debugControllerDispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/debugControllerDispatcher.ts
@@ -58,14 +58,6 @@ export class DebugControllerDispatcher extends Dispatcher<DebugController, chann
     this._object.setReportStateChanged(params.enabled);
   }
 
-  async resetForReuse(params: channels.DebugControllerResetForReuseParams, progress: Progress) {
-    await this._object.resetForReuse(progress);
-  }
-
-  async navigate(params: channels.DebugControllerNavigateParams, progress: Progress) {
-    await this._object.navigate(progress, params.url);
-  }
-
   async setRecorderMode(params: channels.DebugControllerSetRecorderModeParams, progress: Progress) {
     await this._object.setRecorderMode(progress, params);
   }
@@ -86,10 +78,6 @@ export class DebugControllerDispatcher extends Dispatcher<DebugController, chann
     this._object.kill();
   }
 
-  async closeAllBrowsers(params: channels.DebugControllerCloseAllBrowsersParams, progress: Progress) {
-    await this._object.closeAllBrowsers();
-  }
-
   override _onDispose() {
     eventsHelper.removeEventListeners(this._listeners);
     this._object.dispose();
diff --git a/packages/playwright-core/src/server/dispatchers/localUtilsDispatcher.ts b/packages/playwright-core/src/server/dispatchers/localUtilsDispatcher.ts
index 94d0332b47a6e..bcc190eb25a80 100644
--- a/packages/playwright-core/src/server/dispatchers/localUtilsDispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/localUtilsDispatcher.ts
@@ -24,7 +24,6 @@ import { Progress } from '../progress';
 import { SocksInterceptor } from '../socksInterceptor';
 import { WebSocketTransport } from '../transport';
 import { fetchData } from '../utils/network';
-import { resolveGlobToRegexPattern } from '../../utils/isomorphic/urlMatch';
 
 import type { HarBackend } from '../harBackend';
 import type { Playwright } from '../playwright';
@@ -117,11 +116,6 @@ export class LocalUtilsDispatcher extends Dispatcher<SdkObject, channels.LocalUt
     pipe.on('close', () => transport.close());
     return { pipe, headers: transport.headers };
   }
-
-  async globToRegex(params: channels.LocalUtilsGlobToRegexParams, progress: Progress): Promise<channels.LocalUtilsGlobToRegexResult> {
-    const regex = resolveGlobToRegexPattern(params.baseURL, params.glob, params.webSocketUrl);
-    return { regex };
-  }
 }
 
 async function urlToWSEndpoint(progress: Progress, endpointURL: string): Promise<string> {
diff --git a/packages/playwright-core/src/server/playwright.ts b/packages/playwright-core/src/server/playwright.ts
index a4381b1d3c837..c30fb54ef89da 100644
--- a/packages/playwright-core/src/server/playwright.ts
+++ b/packages/playwright-core/src/server/playwright.ts
@@ -74,10 +74,6 @@ export class Playwright extends SdkObject {
     this.debugController = new DebugController(this);
   }
 
-  async hideHighlight() {
-    await Promise.all([...this._allPages].map(p => p.hideHighlight().catch(() => {})));
-  }
-
   allBrowsers(): Browser[] {
     return [...this._allBrowsers];
   }
diff --git a/packages/playwright-core/src/utils/isomorphic/protocolMetainfo.ts b/packages/playwright-core/src/utils/isomorphic/protocolMetainfo.ts
index 8354f6f46d9c8..33bc1e0b4ae71 100644
--- a/packages/playwright-core/src/utils/isomorphic/protocolMetainfo.ts
+++ b/packages/playwright-core/src/utils/isomorphic/protocolMetainfo.ts
@@ -32,19 +32,15 @@ export const methodMetainfo = new Map<string, { internal?: boolean, title?: stri
   ['LocalUtils.tracingStarted', { internal: true, }],
   ['LocalUtils.addStackToTracingNoReply', { internal: true, }],
   ['LocalUtils.traceDiscarded', { internal: true, }],
-  ['LocalUtils.globToRegex', { internal: true, }],
   ['Root.initialize', { internal: true, }],
   ['Playwright.newRequest', { title: 'Create request context', }],
   ['DebugController.initialize', { internal: true, }],
   ['DebugController.setReportStateChanged', { internal: true, }],
-  ['DebugController.resetForReuse', { internal: true, }],
-  ['DebugController.navigate', { internal: true, }],
   ['DebugController.setRecorderMode', { internal: true, }],
   ['DebugController.highlight', { internal: true, }],
   ['DebugController.hideHighlight', { internal: true, }],
   ['DebugController.resume', { internal: true, }],
   ['DebugController.kill', { internal: true, }],
-  ['DebugController.closeAllBrowsers', { internal: true, }],
   ['SocksSupport.socksConnected', { internal: true, }],
   ['SocksSupport.socksFailed', { internal: true, }],
   ['SocksSupport.socksData', { internal: true, }],
diff --git a/packages/playwright-core/src/utils/isomorphic/urlMatch.ts b/packages/playwright-core/src/utils/isomorphic/urlMatch.ts
index 7dbfe129eecfe..3741303c83d4e 100644
--- a/packages/playwright-core/src/utils/isomorphic/urlMatch.ts
+++ b/packages/playwright-core/src/utils/isomorphic/urlMatch.ts
@@ -102,7 +102,7 @@ export function urlMatches(baseURL: string | undefined, urlString: string, match
   return match(url);
 }
 
-export function resolveGlobToRegexPattern(baseURL: string | undefined, glob: string, webSocketUrl?: boolean): string {
+function resolveGlobToRegexPattern(baseURL: string | undefined, glob: string, webSocketUrl?: boolean): string {
   if (webSocketUrl)
     baseURL = toWebSocketBaseUrl(baseURL);
   glob = resolveGlobBase(baseURL, glob);
diff --git a/packages/playwright/src/runner/tasks.ts b/packages/playwright/src/runner/tasks.ts
index db3fc99414245..66d4e0ce6d099 100644
--- a/packages/playwright/src/runner/tasks.ts
+++ b/packages/playwright/src/runner/tasks.ts
@@ -103,7 +103,7 @@ async function finishTaskRun(testRun: TestRun, status: FullResult['status']) {
 
 export function createGlobalSetupTasks(config: FullConfigInternal) {
   const tasks: Task<TestRun>[] = [];
-  if (!config.configCLIOverrides.preserveOutputDir && !process.env.PW_TEST_NO_REMOVE_OUTPUT_DIRS)
+  if (!config.configCLIOverrides.preserveOutputDir)
     tasks.push(createRemoveOutputDirsTask());
   tasks.push(
       ...createPluginSetupTasks(config),
diff --git a/packages/protocol/src/channels.d.ts b/packages/protocol/src/channels.d.ts
index ea9ab4b2f17a2..73017cb438910 100644
--- a/packages/protocol/src/channels.d.ts
+++ b/packages/protocol/src/channels.d.ts
@@ -485,7 +485,6 @@ export interface LocalUtilsChannel extends LocalUtilsEventTarget, Channel {
   tracingStarted(params: LocalUtilsTracingStartedParams, progress?: Progress): Promise<LocalUtilsTracingStartedResult>;
   addStackToTracingNoReply(params: LocalUtilsAddStackToTracingNoReplyParams, progress?: Progress): Promise<LocalUtilsAddStackToTracingNoReplyResult>;
   traceDiscarded(params: LocalUtilsTraceDiscardedParams, progress?: Progress): Promise<LocalUtilsTraceDiscardedResult>;
-  globToRegex(params: LocalUtilsGlobToRegexParams, progress?: Progress): Promise<LocalUtilsGlobToRegexResult>;
 }
 export type LocalUtilsZipParams = {
   zipFile: string,
@@ -584,18 +583,6 @@ export type LocalUtilsTraceDiscardedOptions = {
 
 };
 export type LocalUtilsTraceDiscardedResult = void;
-export type LocalUtilsGlobToRegexParams = {
-  glob: string,
-  baseURL?: string,
-  webSocketUrl?: boolean,
-};
-export type LocalUtilsGlobToRegexOptions = {
-  baseURL?: string,
-  webSocketUrl?: boolean,
-};
-export type LocalUtilsGlobToRegexResult = {
-  regex: string,
-};
 
 export interface LocalUtilsEvents {
 }
@@ -739,14 +726,11 @@ export interface DebugControllerChannel extends DebugControllerEventTarget, Chan
   _type_DebugController: boolean;
   initialize(params: DebugControllerInitializeParams, progress?: Progress): Promise<DebugControllerInitializeResult>;
   setReportStateChanged(params: DebugControllerSetReportStateChangedParams, progress?: Progress): Promise<DebugControllerSetReportStateChangedResult>;
-  resetForReuse(params?: DebugControllerResetForReuseParams, progress?: Progress): Promise<DebugControllerResetForReuseResult>;
-  navigate(params: DebugControllerNavigateParams, progress?: Progress): Promise<DebugControllerNavigateResult>;
   setRecorderMode(params: DebugControllerSetRecorderModeParams, progress?: Progress): Promise<DebugControllerSetRecorderModeResult>;
   highlight(params: DebugControllerHighlightParams, progress?: Progress): Promise<DebugControllerHighlightResult>;
   hideHighlight(params?: DebugControllerHideHighlightParams, progress?: Progress): Promise<DebugControllerHideHighlightResult>;
   resume(params?: DebugControllerResumeParams, progress?: Progress): Promise<DebugControllerResumeResult>;
   kill(params?: DebugControllerKillParams, progress?: Progress): Promise<DebugControllerKillResult>;
-  closeAllBrowsers(params?: DebugControllerCloseAllBrowsersParams, progress?: Progress): Promise<DebugControllerCloseAllBrowsersResult>;
 }
 export type DebugControllerInspectRequestedEvent = {
   selector: string,
@@ -783,16 +767,6 @@ export type DebugControllerSetReportStateChangedOptions = {
 
 };
 export type DebugControllerSetReportStateChangedResult = void;
-export type DebugControllerResetForReuseParams = {};
-export type DebugControllerResetForReuseOptions = {};
-export type DebugControllerResetForReuseResult = void;
-export type DebugControllerNavigateParams = {
-  url: string,
-};
-export type DebugControllerNavigateOptions = {
-
-};
-export type DebugControllerNavigateResult = void;
 export type DebugControllerSetRecorderModeParams = {
   mode: 'inspecting' | 'recording' | 'none',
   testIdAttributeName?: string,
@@ -819,9 +793,6 @@ export type DebugControllerResumeResult = void;
 export type DebugControllerKillParams = {};
 export type DebugControllerKillOptions = {};
 export type DebugControllerKillResult = void;
-export type DebugControllerCloseAllBrowsersParams = {};
-export type DebugControllerCloseAllBrowsersOptions = {};
-export type DebugControllerCloseAllBrowsersResult = void;
 
 export interface DebugControllerEvents {
   'inspectRequested': DebugControllerInspectRequestedEvent;
diff --git a/packages/protocol/src/protocol.yml b/packages/protocol/src/protocol.yml
index e59829c637995..bbfdfcebe3e89 100644
--- a/packages/protocol/src/protocol.yml
+++ b/packages/protocol/src/protocol.yml
@@ -765,14 +765,6 @@ LocalUtils:
       parameters:
         stacksId: string
 
-    globToRegex:
-      internal: true
-      parameters:
-        glob: string
-        baseURL: string?
-        webSocketUrl: boolean?
-      returns:
-        regex: string
 
 Root:
   type: interface
@@ -892,14 +884,6 @@ DebugController:
       parameters:
         enabled: boolean
 
-    resetForReuse:
-      internal: true
-
-    navigate:
-      internal: true
-      parameters:
-        url: string
-
     setRecorderMode:
       internal: true
       parameters:
@@ -926,9 +910,6 @@ DebugController:
     kill:
       internal: true
 
-    closeAllBrowsers:
-      internal: true
-
   events:
     inspectRequested:
       parameters:
diff --git a/tests/library/debug-controller.spec.ts b/tests/library/debug-controller.spec.ts
index 3fe102446d4e1..309e13fe088c4 100644
--- a/tests/library/debug-controller.spec.ts
+++ b/tests/library/debug-controller.spec.ts
@@ -135,22 +135,12 @@ test('should report pages', async ({ backend, connectedBrowser }) => {
   ]);
 });
 
-test('should navigate all', async ({ backend, connectedBrowser }) => {
-  const context = await connectedBrowser.newContextForReuse();
-  const page1 = await context.newPage();
-  const page2 = await context.newPage();
-
-  await backend.navigate({ url: 'data:text/plain,Hello world' });
-
-  expect(await page1.evaluate(() => window.location.href)).toBe('data:text/plain,Hello world');
-  expect(await page2.evaluate(() => window.location.href)).toBe('data:text/plain,Hello world');
-});
-
 test('should reset for reuse', async ({ backend, connectedBrowser }) => {
   const context = await connectedBrowser.newContextForReuse();
   const page1 = await context.newPage();
   const page2 = await context.newPage();
-  await backend.navigate({ url: 'data:text/plain,Hello world' });
+  await page1.goto('data:text/plain,Hello world');
+  await page2.goto('data:text/plain,Hello world');
 
   const context2 = await connectedBrowser.newContextForReuse();
   expect(context2.pages().length).toBe(1);
@@ -167,7 +157,8 @@ test('should highlight all', async ({ backend, connectedBrowser }) => {
   const context = await connectedBrowser.newContextForReuse();
   const page1 = await context.newPage();
   const page2 = await context.newPage();
-  await backend.navigate({ url: 'data:text/html,<button>Submit</button>' });
+  await page1.goto('data:text/html,<button>Submit</button>');
+  await page2.goto('data:text/html,<button>Submit</button>');
   await backend.highlight({ selector: 'button' });
   await expect(page1.getByText('locator(\'button\')')).toBeVisible();
   await expect(page2.getByText('locator(\'button\')')).toBeVisible();
@@ -275,7 +266,7 @@ test('should highlight inside iframe', async ({ backend, connectedBrowser }, tes
 
   const context = await connectedBrowser.newContextForReuse();
   const page = await context.newPage();
-  await backend.navigate({ url: `data:text/html,<div>bar</div><iframe srcdoc="<div>bar</div>"/>` });
+  await page.goto(`data:text/html,<div>bar</div><iframe srcdoc="<div>bar</div>"/>`);
 
 
   await page.frameLocator('iframe').getByText('bar').highlight();
@@ -299,7 +290,7 @@ test('should highlight inside iframe', async ({ backend, connectedBrowser }, tes
 test('should highlight aria template', async ({ backend, connectedBrowser }, testInfo) => {
   const context = await connectedBrowser.newContextForReuse();
   const page = await context.newPage();
-  await backend.navigate({ url: `data:text/html,<button>Submit</button>` });
+  await page.goto(`data:text/html,<button>Submit</button>`);
 
   const button = page.getByRole('button');
   const highlight = page.locator('x-pw-highlight');
@@ -314,7 +305,6 @@ test('should highlight aria template', async ({ backend, connectedBrowser }, tes
 });
 
 test('should report error in aria template', async ({ backend }) => {
-  await backend.navigate({ url: `data:text/html,<button>Submit</button>` });
   const error = await backend.highlight({ ariaTemplate: `- button "Submit` }).catch(e => e);
   expect(error.message).toContain('Unterminated string:');
 });

From 30a45863cc6dbc9c13b8824feaba7faea9ae8b3d Mon Sep 17 00:00:00 2001
From: Dmitry Gozman <dgozman@gmail.com>
Date: Tue, 29 Jul 2025 13:27:58 +0100
Subject: [PATCH 2/9] chore: remove unneeded Progress from video recorder
 (#36826)

---
 .../src/server/chromium/videoRecorder.ts      | 33 +++++++------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/packages/playwright-core/src/server/chromium/videoRecorder.ts b/packages/playwright-core/src/server/chromium/videoRecorder.ts
index 59dc50c837c07..0e4c25d8d94be 100644
--- a/packages/playwright-core/src/server/chromium/videoRecorder.ts
+++ b/packages/playwright-core/src/server/chromium/videoRecorder.ts
@@ -14,13 +14,10 @@
  * limitations under the License.
  */
 
-import { assert, monotonicTime } from '../../utils';
-import { serverSideCallMetadata } from '../instrumentation';
+import { assert, debugLogger, monotonicTime } from '../../utils';
 import { Page } from '../page';
 import { launchProcess } from '../utils/processLauncher';
-import { ProgressController } from '../progress';
 
-import type { Progress } from '../progress';
 import type * as types from '../types';
 import type { ChildProcess } from 'child_process';
 
@@ -33,7 +30,6 @@ export class VideoRecorder {
   private _lastFrameTimestamp: number = 0;
   private _lastFrameBuffer: Buffer | null = null;
   private _lastWriteTimestamp: number = 0;
-  private readonly _progress: Progress;
   private _frameQueue: Buffer[] = [];
   private _isStopped = false;
   private _ffmpegPath: string;
@@ -42,18 +38,12 @@ export class VideoRecorder {
     if (!options.outputFile.endsWith('.webm'))
       throw new Error('File must have .webm extension');
 
-    const controller = new ProgressController(serverSideCallMetadata(), page);
-    controller.setLogName('browser');
-    return await controller.run(async progress => {
-      const recorder = new VideoRecorder(page, ffmpegPath, progress);
-      progress.cleanupWhenAborted(() => recorder.stop());
-      await recorder._launch(options);
-      return recorder;
-    });
+    const recorder = new VideoRecorder(page, ffmpegPath);
+    await recorder._launch(options);
+    return recorder;
   }
 
-  private constructor(page: Page, ffmpegPath: string, progress: Progress) {
-    this._progress = progress;
+  private constructor(page: Page, ffmpegPath: string) {
     this._ffmpegPath = ffmpegPath;
     page.on(Page.Events.ScreencastFrame, frame => this.writeFrame(frame.buffer, frame.frameSwapWallTime / 1000));
   }
@@ -102,27 +92,26 @@ export class VideoRecorder {
     const h = options.height;
     const args = `-loglevel error -f image2pipe -avioflags direct -fpsprobesize 0 -probesize 32 -analyzeduration 0 -c:v mjpeg -i pipe:0 -y -an -r ${fps} -c:v vp8 -qmin 0 -qmax 50 -crf 8 -deadline realtime -speed 8 -b:v 1M -threads 1 -vf pad=${w}:${h}:0:0:gray,crop=${w}:${h}:0:0`.split(' ');
     args.push(options.outputFile);
-    const progress = this._progress;
 
     const { launchedProcess, gracefullyClose } = await launchProcess({
       command: this._ffmpegPath,
       args,
       stdio: 'stdin',
-      log: (message: string) => progress.log(message),
+      log: (message: string) => debugLogger.log('browser', message),
       tempDirectories: [],
       attemptToGracefullyClose: async () => {
-        progress.log('Closing stdin...');
+        debugLogger.log('browser', 'Closing stdin...');
         launchedProcess.stdin!.end();
       },
       onExit: (exitCode, signal) => {
-        progress.log(`ffmpeg onkill exitCode=${exitCode} signal=${signal}`);
+        debugLogger.log('browser', `ffmpeg onkill exitCode=${exitCode} signal=${signal}`);
       },
     });
     launchedProcess.stdin!.on('finish', () => {
-      progress.log('ffmpeg finished input.');
+      debugLogger.log('browser', 'ffmpeg finished input.');
     });
     launchedProcess.stdin!.on('error', () => {
-      progress.log('ffmpeg error.');
+      debugLogger.log('browser', 'ffmpeg error.');
     });
     this._process = launchedProcess;
     this._gracefullyClose = gracefullyClose;
@@ -154,7 +143,7 @@ export class VideoRecorder {
   private async _sendFrame(frame: Buffer) {
     return new Promise(f => this._process!.stdin!.write(frame, f)).then(error => {
       if (error)
-        this._progress.log(`ffmpeg failed to write: ${String(error)}`);
+        debugLogger.log('browser', `ffmpeg failed to write: ${String(error)}`);
     });
   }
 

From 2b144867773a4353385c3cff2902752dc34044cd Mon Sep 17 00:00:00 2001
From: Adam Gastineau <adam@agg.im>
Date: Tue, 29 Jul 2025 05:48:00 -0700
Subject: [PATCH 3/9] fix(html): improve metadata section spacing (#36700)

---
 packages/html-reporter/src/headerView.css    |  1 +
 packages/html-reporter/src/metadataView.css  |  8 ++++++--
 packages/html-reporter/src/testFileView.css  |  7 ++++++-
 packages/html-reporter/src/testFilesView.tsx | 17 +++++++++++++----
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/packages/html-reporter/src/headerView.css b/packages/html-reporter/src/headerView.css
index b9331ab89f273..f8ef79e44f715 100644
--- a/packages/html-reporter/src/headerView.css
+++ b/packages/html-reporter/src/headerView.css
@@ -24,6 +24,7 @@
 
 .header-view div {
   flex-shrink: 0;
+  flex-wrap: wrap;
 }
 
 .header-superheader {
diff --git a/packages/html-reporter/src/metadataView.css b/packages/html-reporter/src/metadataView.css
index d62635909e778..b91a5e830c7e3 100644
--- a/packages/html-reporter/src/metadataView.css
+++ b/packages/html-reporter/src/metadataView.css
@@ -17,14 +17,18 @@
 .metadata-toggle {
   cursor: pointer;
   user-select: none;
-  margin-left: 8px;
   color: var(--color-fg-default);
 }
 
+.metadata-toggle-second-line {
+  margin-top: 8px;
+  margin-left: 8px;
+}
+
 .metadata-view {
   border: 1px solid var(--color-border-default);
   border-radius: 6px;
-  margin-top: 8px;
+  margin-top: 12px;
 }
 
 .metadata-view .metadata-section {
diff --git a/packages/html-reporter/src/testFileView.css b/packages/html-reporter/src/testFileView.css
index c071781ce17cd..5140214f0a443 100644
--- a/packages/html-reporter/src/testFileView.css
+++ b/packages/html-reporter/src/testFileView.css
@@ -62,6 +62,11 @@
 .test-file-header-info {
   display: flex;
   align-items: center;
-  gap: 8px;
+  gap: 4px 8px;
   color: var(--color-fg-muted);
+}
+
+.test-file-header-br {
+  flex-basis: 100%;
+  height: 0;
 }
\ No newline at end of file
diff --git a/packages/html-reporter/src/testFilesView.tsx b/packages/html-reporter/src/testFilesView.tsx
index 527deadadb965..efffa58a955f1 100644
--- a/packages/html-reporter/src/testFilesView.tsx
+++ b/packages/html-reporter/src/testFilesView.tsx
@@ -24,6 +24,7 @@ import { CodeSnippet } from './testErrorView';
 import * as icons from './icons';
 import { isMetadataEmpty, MetadataView } from './metadataView';
 import { HeaderView } from './headerView';
+import { clsx } from '@web/uiUtils';
 
 export const TestFilesView: React.FC<{
   tests: TestFileSummary[],
@@ -71,9 +72,19 @@ export const TestFilesHeader: React.FC<{
   if (!report)
     return null;
 
+  const showProject = report.projectNames.length === 1 && !!report.projectNames[0];
+  const isMetadataInTopLine = !showProject && !filteredStats;
+
+  const metadataToggleButton = !isMetadataEmpty(report.metadata) && (
+    <div className={clsx('metadata-toggle', !isMetadataInTopLine && 'metadata-toggle-second-line')} role='button' onClick={toggleMetadataVisible} title={metadataVisible ? 'Hide metadata' : 'Show metadata'}>
+      {metadataVisible ? icons.downArrow() : icons.rightArrow()}Metadata
+    </div>
+  );
+
   const leftSuperHeader = <div className='test-file-header-info'>
-    {report.projectNames.length === 1 && !!report.projectNames[0] && <div data-testid='project-name'>Project: {report.projectNames[0]}</div>}
+    {showProject && <div data-testid='project-name'>Project: {report.projectNames[0]}</div>}
     {filteredStats && <div data-testid='filtered-tests-count'>Filtered: {filteredStats.total} {!!filteredStats.total && ('(' + msToString(filteredStats.duration) + ')')}</div>}
+    {isMetadataInTopLine && metadataToggleButton}
   </div>;
 
   const rightSuperHeader = <>
@@ -83,9 +94,7 @@ export const TestFilesHeader: React.FC<{
 
   return <>
     <HeaderView title={report.title} leftSuperHeader={leftSuperHeader} rightSuperHeader={rightSuperHeader} />
-    {!isMetadataEmpty(report.metadata) && <div className='metadata-toggle' role='button' onClick={toggleMetadataVisible} title={metadataVisible ? 'Hide metadata' : 'Show metadata'}>
-      {metadataVisible ? icons.downArrow() : icons.rightArrow()}Metadata
-    </div>}
+    {!isMetadataInTopLine && metadataToggleButton}
     {metadataVisible && <MetadataView metadata={report.metadata}/>}
     {!!report.errors.length && <AutoChip header='Errors' dataTestId='report-errors'>
       {report.errors.map((error, index) => <CodeSnippet key={'test-report-error-message-' + index} code={error}/>)}

From f7f6435cfae0a35a641e91b2b5f1969882f6ecdb Mon Sep 17 00:00:00 2001
From: Adam Gastineau <adam@agg.im>
Date: Tue, 29 Jul 2025 05:48:19 -0700
Subject: [PATCH 4/9] fix(html): prevent unnecessary text selection on chips
 (#36718)

---
 packages/html-reporter/src/chip.css         | 5 +++++
 packages/html-reporter/src/testFileView.tsx | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/html-reporter/src/chip.css b/packages/html-reporter/src/chip.css
index 1b40275166d7b..66d1ea3d9dae0 100644
--- a/packages/html-reporter/src/chip.css
+++ b/packages/html-reporter/src/chip.css
@@ -27,6 +27,11 @@
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
+  user-select: none;
+}
+
+.chip-header-allow-selection {
+  user-select: text;
 }
 
 .chip-header.expanded-false {
diff --git a/packages/html-reporter/src/testFileView.tsx b/packages/html-reporter/src/testFileView.tsx
index ed26b1fc5f984..d8a9670100919 100644
--- a/packages/html-reporter/src/testFileView.tsx
+++ b/packages/html-reporter/src/testFileView.tsx
@@ -37,7 +37,7 @@ export const TestFileView: React.FC<React.PropsWithChildren<{
     expanded={isFileExpanded(file.fileId)}
     noInsets={true}
     setExpanded={(expanded => setFileExpanded(file.fileId, expanded))}
-    header={<span>
+    header={<span className='chip-header-allow-selection'>
       {file.fileName}
     </span>}>
     {file.tests.map(test =>

From a6c7d94f529ff53d068bb4c9bba469eaa24cf13b Mon Sep 17 00:00:00 2001
From: Adam Gastineau <adam@agg.im>
Date: Tue, 29 Jul 2025 05:48:50 -0700
Subject: [PATCH 5/9] chore(html): display skipped icon for skipped tests
 (#36814)

---
 packages/html-reporter/src/headerView.tsx | 2 +-
 packages/html-reporter/src/icons.tsx      | 6 ++++++
 packages/html-reporter/src/statusIcon.tsx | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/html-reporter/src/headerView.tsx b/packages/html-reporter/src/headerView.tsx
index c0804a6681762..b9e2fb743f250 100644
--- a/packages/html-reporter/src/headerView.tsx
+++ b/packages/html-reporter/src/headerView.tsx
@@ -97,7 +97,7 @@ const StatsNavView: React.FC<{
       {!!stats.flaky && statusIcon('flaky')} Flaky <span className='d-inline counter'>{stats.flaky}</span>
     </Link>
     <Link className='subnav-item' click={filterWithQuery(q, 's:skipped', false)} ctrlClick={filterWithQuery(q, 's:skipped', true)}>
-      Skipped <span className='d-inline counter'>{stats.skipped}</span>
+      {!!stats.skipped && statusIcon('skipped')} Skipped <span className='d-inline counter'>{stats.skipped}</span>
     </Link>
   </nav>;
 };
diff --git a/packages/html-reporter/src/icons.tsx b/packages/html-reporter/src/icons.tsx
index ffe6a08fcf015..a7368c5f4a30a 100644
--- a/packages/html-reporter/src/icons.tsx
+++ b/packages/html-reporter/src/icons.tsx
@@ -65,6 +65,12 @@ export const clock = () => {
   </svg>;
 };
 
+export const skip = () => {
+  return <svg aria-hidden='true' viewBox='0 0 16 16' width='16' height='16' data-view-component='true' className='octicon color-fg-muted'>
+    <path d='M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Zm9.78-2.22-5.5 5.5a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734l5.5-5.5a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042Z'></path>
+  </svg>;
+};
+
 export const blank = () => {
   return <svg className='octicon' viewBox='0 0 16 16' version='1.1' width='16' height='16' aria-hidden='true'></svg>;
 };
diff --git a/packages/html-reporter/src/statusIcon.tsx b/packages/html-reporter/src/statusIcon.tsx
index 155f14041bcc3..39837955aecb7 100644
--- a/packages/html-reporter/src/statusIcon.tsx
+++ b/packages/html-reporter/src/statusIcon.tsx
@@ -32,6 +32,6 @@ export function statusIcon(status: 'failed' | 'timedOut' | 'skipped' | 'passed'
       return icons.warning();
     case 'skipped':
     case 'interrupted':
-      return icons.blank();
+      return icons.skip();
   }
 }

From b16ff91fd8824f9f2421236e1d29ca817a6ecd86 Mon Sep 17 00:00:00 2001
From: Adam Gastineau <adam@agg.im>
Date: Tue, 29 Jul 2025 05:49:20 -0700
Subject: [PATCH 6/9] chore(html): align trace button so it doesn't resize the
 test row (#36815)

---
 packages/html-reporter/src/testFileView.css | 15 +++++++++++++++
 packages/html-reporter/src/testFileView.tsx | 14 ++++++++------
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/packages/html-reporter/src/testFileView.css b/packages/html-reporter/src/testFileView.css
index 5140214f0a443..4c2b11abae955 100644
--- a/packages/html-reporter/src/testFileView.css
+++ b/packages/html-reporter/src/testFileView.css
@@ -41,6 +41,21 @@
   align-items: center;
 }
 
+.test-file-details-row-items {
+  display: flex;
+  height: 16px;
+}
+
+.test-file-details-row-items > .link-badge {
+  /* Align badges */
+  margin-top: -2px;
+}
+
+.test-file-details-row-items > .trace-link {
+  /* Center in row */
+  margin-top: -4px;
+}
+
 .test-file-path {
   text-overflow: ellipsis;
   overflow: hidden;
diff --git a/packages/html-reporter/src/testFileView.tsx b/packages/html-reporter/src/testFileView.tsx
index d8a9670100919..49af0f4b10f43 100644
--- a/packages/html-reporter/src/testFileView.tsx
+++ b/packages/html-reporter/src/testFileView.tsx
@@ -59,12 +59,14 @@ export const TestFileView: React.FC<React.PropsWithChildren<{
           <span data-testid='test-duration' style={{ minWidth: '50px', textAlign: 'right' }}>{msToString(test.duration)}</span>
         </div>
         <div className='test-file-details-row'>
-          <Link href={testResultHref({ test })} title={[...test.path, test.title].join(' › ')} className='test-file-path-link'>
-            <span className='test-file-path'>{test.location.file}:{test.location.line}</span>
-          </Link>
-          {imageDiffBadge(test)}
-          {videoBadge(test)}
-          <TraceLink test={test} dim={true} />
+          <div className='test-file-details-row-items'>
+            <Link href={testResultHref({ test })} title={[...test.path, test.title].join(' › ')} className='test-file-path-link'>
+              <span className='test-file-path'>{test.location.file}:{test.location.line}</span>
+            </Link>
+            {imageDiffBadge(test)}
+            {videoBadge(test)}
+            <TraceLink test={test} dim={true} />
+          </div>
         </div>
       </div>
     )}

From bcb5e67d5aebda54b74ee2b00a2db68b744b87bb Mon Sep 17 00:00:00 2001
From: Max Schmitt <max@schmitt.mx>
Date: Tue, 29 Jul 2025 15:42:36 +0200
Subject: [PATCH 7/9] test: skip newly added client-cert test on service mode
 (#36831)

---
 tests/library/client-certificates.spec.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/library/client-certificates.spec.ts b/tests/library/client-certificates.spec.ts
index a3ebbb83a2bff..61b6580e86cc2 100644
--- a/tests/library/client-certificates.spec.ts
+++ b/tests/library/client-certificates.spec.ts
@@ -371,7 +371,8 @@ test.describe('browser', () => {
     await page.close();
   });
 
-  test('should pass with matching certificates and when a http proxy is used from env', async ({ browser, startCCServer, asset, browserName, proxyServer, isMac }) => {
+  test('should pass with matching certificates and when a http proxy is used from env', async ({ mode, browser, startCCServer, asset, browserName, proxyServer, isMac }) => {
+    test.skip(mode !== 'default', 'Out of process transport does not allow us to set env vars dynamically');
     process.env.HTTPS_PROXY = `http://localhost:${proxyServer.PORT}`;
     const serverURL = await startCCServer({ useFakeLocalhost: browserName === 'webkit' && isMac });
     proxyServer.forwardTo(parseInt(new URL(serverURL).port, 10), { allowConnectRequests: true });

From 93d2b4bd48b96bce98ab938f80c918bd0c524164 Mon Sep 17 00:00:00 2001
From: Adam Gastineau <adam@agg.im>
Date: Tue, 29 Jul 2025 07:08:38 -0700
Subject: [PATCH 8/9] chore(html): consistent padding between nav link content
 (#36816)

---
 packages/html-reporter/src/common.css          | 11 +++++++++--
 packages/html-reporter/src/headerView.spec.tsx |  4 ++--
 packages/html-reporter/src/headerView.tsx      | 18 +++++++++++++-----
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/packages/html-reporter/src/common.css b/packages/html-reporter/src/common.css
index 63ad3cd70fa04..bf1926a6cc733 100644
--- a/packages/html-reporter/src/common.css
+++ b/packages/html-reporter/src/common.css
@@ -203,7 +203,7 @@ article, aside, details, figcaption, figure, footer, header, main, menu, nav, se
   flex: none;
   position: relative;
   float: left;
-  padding: 5px 10px;
+  padding: 5px 8px;
   font-weight: 500;
   line-height: 20px;
   color: var(--color-fg-default);
@@ -228,6 +228,14 @@ article, aside, details, figcaption, figure, footer, header, main, menu, nav, se
   margin-left: -1px;
 }
 
+.subnav-item .octicon {
+  margin-right: 8px;
+}
+
+.subnav-item-label {
+  margin-right: 8px;
+}
+
 .counter {
   display: inline-block;
   min-width: 20px;
@@ -293,7 +301,6 @@ article, aside, details, figcaption, figure, footer, header, main, menu, nav, se
   }
 
   .subnav-item {
-    padding: 5px 3px;
     border: none;
   }
 
diff --git a/packages/html-reporter/src/headerView.spec.tsx b/packages/html-reporter/src/headerView.spec.tsx
index 2276d62cc1c8b..1ad79683ab18b 100644
--- a/packages/html-reporter/src/headerView.spec.tsx
+++ b/packages/html-reporter/src/headerView.spec.tsx
@@ -38,8 +38,8 @@ test('should render counters', async ({ mount }) => {
   await expect(component.locator('a', { hasText: 'Skipped' }).locator('.counter')).toHaveText('10');
   await expect(component).toMatchAriaSnapshot(`
     - navigation:
-      - link "All 90"
-      - text: Passed 42 Failed 31 Flaky 17 Skipped 10
+      - link "All90"
+      - text: Passed42 Failed31 Flaky17 Skipped10
   `);
 });
 
diff --git a/packages/html-reporter/src/headerView.tsx b/packages/html-reporter/src/headerView.tsx
index b9e2fb743f250..f44b4daf87ca6 100644
--- a/packages/html-reporter/src/headerView.tsx
+++ b/packages/html-reporter/src/headerView.tsx
@@ -85,19 +85,27 @@ const StatsNavView: React.FC<{
   const q = searchParams.get('q')?.toString() || '';
   return <nav>
     <Link className='subnav-item' href='#?'>
-      All <span className='d-inline counter'>{stats.total - stats.skipped}</span>
+      <span className='subnav-item-label'>All</span>
+      <span className='d-inline counter'>{stats.total - stats.skipped}</span>
     </Link>
     <Link className='subnav-item' click={filterWithQuery(q, 's:passed', false)} ctrlClick={filterWithQuery(q, 's:passed', true)}>
-      Passed <span className='d-inline counter'>{stats.expected}</span>
+      <span className='subnav-item-label'>Passed</span>
+      <span className='d-inline counter'>{stats.expected}</span>
     </Link>
     <Link className='subnav-item' click={filterWithQuery(q, 's:failed', false)} ctrlClick={filterWithQuery(q, 's:failed', true)}>
-      {!!stats.unexpected && statusIcon('unexpected')} Failed <span className='d-inline counter'>{stats.unexpected}</span>
+      {!!stats.unexpected && statusIcon('unexpected')}
+      <span className='subnav-item-label'>Failed</span>
+      <span className='d-inline counter'>{stats.unexpected}</span>
     </Link>
     <Link className='subnav-item' click={filterWithQuery(q, 's:flaky', false)} ctrlClick={filterWithQuery(q, 's:flaky', true)}>
-      {!!stats.flaky && statusIcon('flaky')} Flaky <span className='d-inline counter'>{stats.flaky}</span>
+      {!!stats.flaky && statusIcon('flaky')}
+      <span className='subnav-item-label'>Flaky</span>
+      <span className='d-inline counter'>{stats.flaky}</span>
     </Link>
     <Link className='subnav-item' click={filterWithQuery(q, 's:skipped', false)} ctrlClick={filterWithQuery(q, 's:skipped', true)}>
-      {!!stats.skipped && statusIcon('skipped')} Skipped <span className='d-inline counter'>{stats.skipped}</span>
+      {!!stats.skipped && statusIcon('skipped')}
+      <span className='subnav-item-label'>Skipped</span>
+      <span className='d-inline counter'>{stats.skipped}</span>
     </Link>
   </nav>;
 };

From a65efcbdf312f27a697ddb1e6ad00226506de48c Mon Sep 17 00:00:00 2001
From: Max Schmitt <max@schmitt.mx>
Date: Tue, 29 Jul 2025 18:02:53 +0200
Subject: [PATCH 9/9] chore: page.close -> `Close page` in steps (#36834)

Signed-off-by: Max Schmitt <max@schmitt.mx>
---
 .../playwright-core/src/utils/isomorphic/protocolMetainfo.ts  | 2 +-
 packages/protocol/src/protocol.yml                            | 2 +-
 tests/library/tracing.spec.ts                                 | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/playwright-core/src/utils/isomorphic/protocolMetainfo.ts b/packages/playwright-core/src/utils/isomorphic/protocolMetainfo.ts
index 33bc1e0b4ae71..ce1be44af818d 100644
--- a/packages/playwright-core/src/utils/isomorphic/protocolMetainfo.ts
+++ b/packages/playwright-core/src/utils/isomorphic/protocolMetainfo.ts
@@ -98,7 +98,7 @@ export const methodMetainfo = new Map<string, { internal?: boolean, title?: stri
   ['BrowserContext.clockSetFixedTime', { title: 'Set fixed time "{timeNumber}{timeString}"', }],
   ['BrowserContext.clockSetSystemTime', { title: 'Set system time "{timeNumber}{timeString}"', }],
   ['Page.addInitScript', { }],
-  ['Page.close', { title: 'Close', }],
+  ['Page.close', { title: 'Close page', }],
   ['Page.emulateMedia', { title: 'Emulate media', snapshot: true, }],
   ['Page.exposeBinding', { title: 'Expose binding', }],
   ['Page.goBack', { title: 'Go back', slowMo: true, snapshot: true, }],
diff --git a/packages/protocol/src/protocol.yml b/packages/protocol/src/protocol.yml
index bbfdfcebe3e89..4a5b2910fb2f6 100644
--- a/packages/protocol/src/protocol.yml
+++ b/packages/protocol/src/protocol.yml
@@ -1554,7 +1554,7 @@ Page:
         source: string
 
     close:
-      title: Close
+      title: Close page
       parameters:
         runBeforeUnload: boolean?
         reason: string?
diff --git a/tests/library/tracing.spec.ts b/tests/library/tracing.spec.ts
index ba06509c0456b..6a81df0c62724 100644
--- a/tests/library/tracing.spec.ts
+++ b/tests/library/tracing.spec.ts
@@ -52,7 +52,7 @@ test('should collect trace with resources, but no js', async ({ context, page, s
     'Navigate to "/input/fileupload.html"',
     'Set input files',
     'Wait for timeout',
-    'Close',
+    'Close page',
   ]);
 
   expect(events.some(e => e.type === 'frame-snapshot')).toBeTruthy();
@@ -200,7 +200,7 @@ test('should collect two traces', async ({ context, page, server }, testInfo) =>
     expect(events[0].type).toBe('context-options');
     expect(actions).toEqual([
       'Double click',
-      'Close',
+      'Close page',
     ]);
   }
 });