Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.
TypeScript automationchromechromiume2e-testingelectronend-to-end-testingfirefoxjavascriptplaywrighttesttest-automationtestingtesting-toolswebwebkit
feat(dashboard): flatten browser/context into per-context attached pages (#40333)
Simon Knott119e987e07a4
diff --git a/packages/dashboard/src/dashboardChannel.ts b/packages/dashboard/src/dashboardChannel.tsindex cda3f96462..a6b4450675 100644--- a/packages/dashboard/src/dashboardChannel.ts+++ b/packages/dashboard/src/dashboardChannel.ts@@ -42,9 +42,9 @@ export type DashboardChannelEvents = {export type MouseButton = 'left' | 'middle' | 'right';export interface DashboardChannel {- selectTab(params: { browser: string; page: string }): Promise<void>;- closeTab(params: { browser: string; page: string }): Promise<void>;- newTab(params: { browser: string }): Promise<void>;+ selectTab(params: { browser: string; context: string; page: string }): Promise<void>;+ closeTab(params: { browser: string; context: string; page: string }): Promise<void>;+ newTab(params: { browser: string; context: string }): Promise<void>;closeSession(params: { browser: string }): Promise<void>;deleteSessionData(params: { browser: string }): Promise<void>;setVisible(params: { visible: boolean }): Promise<void>;diff --git a/packages/dashboard/src/index.tsx b/packages/dashboard/src/index.tsxindex 88fe0f6955..7b1ae3e715 100644--- a/packages/dashboard/src/index.tsx+++ b/packages/dashboard/src/index.tsx@@ -50,9 +50,9 @@ const App: React.FC = () => {settingName='dashboardSessionSidebar'sidebar={<SessionSidebarmodel={model}- onSelectTab={tab => { void client.selectTab({ browser: tab.browser, page: tab.page }); }}- onCloseTab={tab => { void client.closeTab({ browser: tab.browser, page: tab.page }); }}- onNewTab={browser => { void client.newTab({ browser }); }}+ onSelectTab={tab => { void client.selectTab({ browser: tab.browser, context: tab.context, page: tab.page }); }}+ onCloseTab={tab => { void client.closeTab({ browser: tab.browser, context: tab.context, page: tab.page }); }}+ onNewTab={(browser, context) => { void client.newTab({ browser, context }); }}/>}main={<div className='dashboard-shell-main'><Dashboard />diff --git a/packages/dashboard/src/sessionSidebar.tsx b/packages/dashboard/src/sessionSidebar.tsxindex b8c51835f3..d82667265f 100644--- a/packages/dashboard/src/sessionSidebar.tsx+++ b/packages/dashboard/src/sessionSidebar.tsx@@ -28,7 +28,7 @@ type SessionSidebarProps = {model: SessionModel;onSelectTab: (tab: Tab) => void;onCloseTab: (tab: Tab) => void;- onNewTab: (browser: string) => void;+ onNewTab: (browser: string, context: string) => void;};function tabFavicon(url: string): string {@@ -70,20 +70,25 @@ export const SessionSidebar: React.FC<SessionSidebarProps> = ({ model, onSelectTreturn () => client.off('tabs', onTabs);}, [client]);- const tabsByBrowser = React.useMemo(() => {- const map = new Map<string, Tab[]>();+ const tabsByBrowserAndContext = React.useMemo(() => {+ const map = new Map<string, Map<string, Tab[]>>();for (const tab of allTabs ?? []) {- let list = map.get(tab.browser);+ let byContext = map.get(tab.browser);+ if (!byContext) {+ byContext = new Map();+ map.set(tab.browser, byContext);+ }+ let list = byContext.get(tab.context);if (!list) {list = [];- map.set(tab.browser, list);+ byContext.set(tab.context, list);}list.push(tab);}return map;}, [allTabs]);- const activeBrowser = React.useMemo(() => allTabs?.find(t => t.selected)?.browser, [allTabs]);+ const activeContext = React.useMemo(() => allTabs?.find(t => t.selected)?.context, [allTabs]);const workspaceGroups = React.useMemo(() => {const groups = new Map<string, SessionStatus[]>();@@ -125,72 +130,81 @@ export const SessionSidebar: React.FC<SessionSidebarProps> = ({ model, onSelectTconst guid = session.browser.guid;const browserType = session.browser.browserName;const channel = session.browser.launchOptions?.channel;- const tabs = allTabs === null ? undefined : (tabsByBrowser.get(guid) ?? []);- return <div key={guid} className='session-chip sidebar-session' role='listitem' title={session.title}>- <div className='sidebar-session-row'>- <div className='session-browser-icon-wrap' title={channel || browserType}>- <span className='session-browser-icon' aria-hidden='true'>- <BrowserIcon browserName={browserType} channel={channel} />- </span>- <ToolbarButton- className='session-browser-close'- icon='close'- title='Close session'- onClick={() => void model.closeSession(session)}- />- </div>- <span className='session-chip-name'>{session.title}</span>- <div className='sidebar-session-row-actions'>- <ToolbarButton- className='sidebar-session-new-tab'- icon='add'- title='New tab'- onClick={() => onNewTab(guid)}- />- </div>- </div>- <div className='sidebar-tab-list' role='list' aria-label={`${session.title} tabs`}>- {tabs === undefined && <div className='sidebar-tabs-loading' role='status' aria-live='polite'>Loading tabs...</div>}- {tabs?.length === 0 && <div className='sidebar-tabs-empty' role='status' aria-live='polite'>No tabs open.</div>}- {tabs?.map(tab => <div- key={tab.page}- className={'sidebar-tab' + (guid === activeBrowser && tab.selected ? ' active' : '')}- role='listitem'- >- <div- className='sidebar-tab-select'- role='button'- tabIndex={0}- aria-current={guid === activeBrowser && tab.selected ? 'page' : undefined}- title={tab.url || tab.title}- onClick={() => onSelectTab(tab)}- onKeyDown={e => {- if (e.key === 'Enter' || e.key === ' ') {- e.preventDefault();- onSelectTab(tab);- }- }}- >- {tab.faviconUrl- ? <img className='sidebar-tab-favicon' src={tab.faviconUrl} alt='' aria-hidden='true' />- : <span className='sidebar-tab-favicon placeholder' aria-hidden='true'>{tabFavicon(tab.url)}</span>}- <span className='sidebar-tab-text'>- <span className='sidebar-tab-title'>{tab.title || 'New Tab'}</span>- <span className='sidebar-tab-url'>{tab.url || 'about:blank'}</span>+ const byContext = tabsByBrowserAndContext.get(guid);+ const contextEntries = byContext ? [...byContext.entries()] : [];+ const rows: { contextGuid: string | null; tabs: Tab[] | undefined }[] =+ allTabs === null+ ? [{ contextGuid: null, tabs: undefined }]+ : contextEntries.length === 0+ ? [{ contextGuid: null, tabs: [] }]+ : contextEntries.map(([contextGuid, tabs]) => ({ contextGuid, tabs }));+ return <React.Fragment key={guid}>+ {rows.map((row, rowIdx) => <div key={row.contextGuid ?? `placeholder-${rowIdx}`} className='session-chip sidebar-session' role='listitem' title={session.title}>+ <div className='sidebar-session-row'>+ <div className='session-browser-icon-wrap' title={channel || browserType}>+ <span className='session-browser-icon' aria-hidden='true'>+ <BrowserIcon browserName={browserType} channel={channel} /></span>+ <ToolbarButton+ className='session-browser-close'+ icon='close'+ title='Close session'+ onClick={() => void model.closeSession(session)}+ /></div>- <ToolbarButton- className='sidebar-tab-close'- icon='close'- title='Close tab'- onClick={e => {- e.stopPropagation();- onCloseTab(tab);- }}- />- </div>)}- </div>- </div>;+ <span className='session-chip-name'>{session.title}</span>+ <div className='sidebar-session-row-actions'>+ {row.contextGuid && <ToolbarButton+ className='sidebar-session-new-tab'+ icon='add'+ title='New tab'+ onClick={() => onNewTab(guid, row.contextGuid!)}+ />}+ </div>+ </div>+ <div className='sidebar-tab-list' role='list' aria-label={`${session.title} tabs`}>+ {row.tabs === undefined && <div className='sidebar-tabs-loading' role='status' aria-live='polite'>Loading tabs...</div>}+ {row.tabs?.length === 0 && <div className='sidebar-tabs-empty' role='status' aria-live='polite'>No tabs open.</div>}+ {row.tabs?.map(tab => <div+ key={tab.page}+ className={'sidebar-tab' + (tab.context === activeContext && tab.selected ? ' active' : '')}+ role='listitem'+ >+ <div+ className='sidebar-tab-select'+ role='button'+ tabIndex={0}+ aria-current={tab.context === activeContext && tab.selected ? 'page' : undefined}+ title={tab.url || tab.title}+ onClick={() => onSelectTab(tab)}+ onKeyDown={e => {+ if (e.key === 'Enter' || e.key === ' ') {+ e.preventDefault();+ onSelectTab(tab);+ }+ }}+ >+ {tab.faviconUrl+ ? <img className='sidebar-tab-favicon' src={tab.faviconUrl} alt='' aria-hidden='true' />+ : <span className='sidebar-tab-favicon placeholder' aria-hidden='true'>{tabFavicon(tab.url)}</span>}+ <span className='sidebar-tab-text'>+ <span className='sidebar-tab-title'>{tab.title || 'New Tab'}</span>+ <span className='sidebar-tab-url'>{tab.url || 'about:blank'}</span>+ </span>+ </div>+ <ToolbarButton+ className='sidebar-tab-close'+ icon='close'+ title='Close tab'+ onClick={e => {+ e.stopPropagation();+ onCloseTab(tab);+ }}+ />+ </div>)}+ </div>+ </div>)}+ </React.Fragment>;})}</div></section>;diff --git a/packages/playwright-core/src/tools/dashboard/dashboardController.ts b/packages/playwright-core/src/tools/dashboard/dashboardController.tsindex efc1e58dca..1f0ff805d6 100644--- a/packages/playwright-core/src/tools/dashboard/dashboardController.ts+++ b/packages/playwright-core/src/tools/dashboard/dashboardController.ts@@ -32,11 +32,9 @@ import type { BrowserDescriptor, BrowserStatus } from '../../serverRegistry';type Disposable = { dispose: () => Promise<void> };type BrowserSlot = {- guid: string;- contextGuid: string;descriptor: BrowserDescriptor;- context: api.BrowserContext;- listeners: Disposable[];+ browser: api.Browser;+ contextListeners: Map<api.BrowserContext, Disposable[]>;};export class DashboardConnection implements Transport {@@ -44,7 +42,7 @@ export class DashboardConnection implements Transport {close?: () => void;private _browsers = new Map<string, BrowserSlot>();- private _attachedBrowser: AttachedBrowser | undefined;+ private _attachedPage: AttachedPage | undefined;private _onclose: () => void;private _onconnected?: () => void;private _onAnnotationSubmit?: (base64Png: string, annotations: AnnotationData[]) => void;@@ -79,8 +77,8 @@ export class DashboardConnection implements Transport {serverRegistry.off('changed', this._pushSessions);this._serverRegistryDispose?.();this._serverRegistryDispose = undefined;- this._attachedBrowser?.dispose();- this._attachedBrowser = undefined;+ this._attachedPage?.dispose();+ this._attachedPage = undefined;for (const stream of this._streams.values()) {void stream.handle.close().catch(() => {})@@ -89,7 +87,7 @@ export class DashboardConnection implements Transport {}this._streams.clear();for (const slot of this._browsers.values())- slot.listeners.forEach(d => d.dispose());+ this._disposeSlot(slot);this._browsers.clear();this._onclose();}@@ -99,7 +97,7 @@ export class DashboardConnection implements Transport {const handler = (this as any)[method];if (typeof handler === 'function')return handler.call(this, params);- const attached = this._attachedBrowser;+ const attached = this._attachedPage;if (!attached)return;// eslint-disable-next-line no-restricted-syntax@@ -108,27 +106,24 @@ export class DashboardConnection implements Transport {return onAtt.call(attached, params);}- async selectTab(params: { browser: string; page: string }) {- await this._switchAttachedTo(params.browser);- await this._attachedBrowser?.selectPageByGuid(params.page);+ async selectTab(params: { browser: string; context: string; page: string }) {+ const page = this._findPage(params);+ if (page)+ await this._switchAttachedTo(page);this._pushTabs();}- async newTab(params: { browser: string }) {- const slot = this._browsers.get(params.browser);- if (!slot)+ async newTab(params: { browser: string; context: string }) {+ const context = this._findContext(params);+ if (!context)return;- const page = await slot.context.newPage();- await this._switchAttachedTo(params.browser);- await this._attachedBrowser?.selectPage(page);+ const page = await context.newPage();+ await this._switchAttachedTo(page);this._pushTabs();}- async closeTab(params: { browser: string; page: string }) {- const slot = this._browsers.get(params.browser);- if (!slot)- return;- const page = slot.context.pages().find(p => pageId(p) === params.page);+ async closeTab(params: { browser: string; context: string; page: string }) {+ const page = this._findPage(params);await page?.close({ reason: 'Closed in Dashboard' });}@@ -151,7 +146,7 @@ export class DashboardConnection implements Transport {if (this._visible === params.visible)return;this._visible = params.visible;- await this._attachedBrowser?.setScreencastActive(params.visible);+ await this._attachedPage?.setScreencastActive(params.visible);}revealSession(sessionName: string, workspaceDir?: string) {@@ -168,8 +163,11 @@ export class DashboardConnection implements Transport {&& (pending.workspaceDir === undefined || s.descriptor.workspaceDir === pending.workspaceDir));if (!slot)return;+ const page = slot.browser.contexts().flatMap(c => c.pages())[0];+ if (!page)+ return;this._pendingReveal = undefined;- await this._switchAttachedTo(slot.guid);+ await this._switchAttachedTo(page);this._pushTabs();}@@ -250,37 +248,47 @@ export class DashboardConnection implements Transport {}private async _aggregateTabs(): Promise<Tab[]> {+ const attachedPage = this._attachedPage?.page;const tasks: Promise<Tab>[] = [];- for (const slot of this._browsers.values()) {- const selectedPage = this._attachedBrowser?.browserGuid === slot.guid- ? this._attachedBrowser.selectedPage()- : null;- for (const page of slot.context.pages()) {- tasks.push((async () => ({- browser: slot.guid,- context: slot.contextGuid,- page: pageId(page),- title: await page.title().catch(() => ''),- url: page.url(),- selected: page === selectedPage,- faviconUrl: await faviconUrl(page),- }))());+ for (const { browser } of this._browsers.values()) {+ for (const context of browser.contexts()) {+ for (const page of context.pages()) {+ tasks.push((async () => ({+ browser: browserId(browser),+ context: contextId(context),+ page: pageId(page),+ title: await page.title().catch(() => ''),+ url: page.url(),+ selected: page === attachedPage,+ faviconUrl: await faviconUrl(page),+ }))());+ }}}return await Promise.all(tasks);}- private async _switchAttachedTo(guid: string) {- if (this._attachedBrowser?.browserGuid === guid)+ private async _switchAttachedTo(page: api.Page) {+ if (this._attachedPage?.page === page)return;- this._attachedBrowser?.dispose();- this._attachedBrowser = undefined;- const slot = this._browsers.get(guid);+ this._attachedPage?.dispose();+ this._attachedPage = undefined;+ const browser = page.context().browser();+ const slot = browser ? [...this._browsers.values()].find(s => s.browser === browser) : undefined;if (!slot)return;- const attached = new AttachedBrowser(this, slot);+ const attached = new AttachedPage(this, slot, page);await attached.init();- this._attachedBrowser = attached;+ this._attachedPage = attached;+ }++ _handleAttachedPageClose(context: api.BrowserContext) {+ this._attachedPage?.dispose();+ this._attachedPage = undefined;+ const next = context.pages()[0];+ if (next)+ void this._switchAttachedTo(next);+ this._pushTabs();}private _pushSessions = () => {@@ -319,11 +327,11 @@ export class DashboardConnection implements Transport {for (const [guid, slot] of this._browsers) {if (connectable.has(guid))continue;- if (this._attachedBrowser?.browserGuid === guid) {- this._attachedBrowser.dispose();- this._attachedBrowser = undefined;+ if (this._attachedPage && this._attachedPage.page.context().browser() === slot.browser) {+ this._attachedPage.dispose();+ this._attachedPage = undefined;}- slot.listeners.forEach(d => d.dispose());+ this._disposeSlot(slot);this._browsers.delete(guid);}@@ -334,194 +342,199 @@ export class DashboardConnection implements Transport {const browser = await connectToBrowserAcrossVersions(status);if (this._browsers.has(guid))continue;- const context = browser.contexts()[0];- if (!context)- continue;const slot: BrowserSlot = {- guid,- // eslint-disable-next-line no-restricted-syntax -- _guid is very conservative.- contextGuid: (context as any)._guid,descriptor: status,- context,- listeners: [],- };- const watchPage = (page: api.Page) => {- slot.listeners.push(- eventsHelper.addEventListener(page, 'load', () => this._pushTabs()),- eventsHelper.addEventListener(page, 'framenavigated', (frame: api.Frame) => {- if (frame === page.mainFrame())- this._pushTabs();- }),- eventsHelper.addEventListener(page, 'close', () => this._pushTabs()),- );+ browser,+ contextListeners: new Map(),};- slot.listeners.push(- eventsHelper.addEventListener(context, 'page', (page: api.Page) => {- watchPage(page);- this._pushTabs();- }),- eventsHelper.addEventListener(context, 'picklocator', (page: api.Page) => {- this._onPickLocator(guid, page).catch(() => {});- }),- );- for (const page of context.pages())- watchPage(page);this._browsers.set(guid, slot);- this._pushTabs();+ for (const context of browser.contexts())+ this._wireContext(context);} catch {// best-effort}}}- private async _onPickLocator(guid: string, page: api.Page) {- await this._switchAttachedTo(guid);- await this._attachedBrowser?.selectPage(page);+ private _wireContext(context: api.BrowserContext) {+ const slot = this._browsers.get(browserId(context.browser()!));+ if (!slot)+ return;+ if (slot.contextListeners.has(context))+ return;+ const listeners: Disposable[] = [];+ slot.contextListeners.set(context, listeners);+ const watchPage = (page: api.Page) => {+ listeners.push(+ eventsHelper.addEventListener(page, 'load', () => this._pushTabs()),+ eventsHelper.addEventListener(page, 'framenavigated', (frame: api.Frame) => {+ if (frame === page.mainFrame())+ this._pushTabs();+ }),+ eventsHelper.addEventListener(page, 'close', () => this._pushTabs()),+ );+ };+ listeners.push(+ eventsHelper.addEventListener(context, 'page', (page: api.Page) => {+ watchPage(page);+ this._pushTabs();+ }),+ eventsHelper.addEventListener(context, 'picklocator', (page: api.Page) => {+ this._onPickLocator(page).catch(() => {});+ }),+ eventsHelper.addEventListener(context, 'close', () => {+ const ls = slot.contextListeners.get(context);+ if (ls) {+ ls.forEach(d => d.dispose());+ slot.contextListeners.delete(context);+ }+ if (this._attachedPage && this._attachedPage.page.context() === context) {+ this._attachedPage.dispose();+ this._attachedPage = undefined;+ }+ this._pushTabs();+ }),+ );+ for (const page of context.pages())+ watchPage(page);+ this._pushTabs();+ }++ private _disposeSlot(slot: BrowserSlot) {+ for (const listeners of slot.contextListeners.values())+ listeners.forEach(d => d.dispose());+ slot.contextListeners.clear();+ }++ private _findContext(params: { browser: string; context: string }): api.BrowserContext | undefined {+ const slot = this._browsers.get(params.browser);+ if (!slot)+ return undefined;+ return slot.browser.contexts().find(c => contextId(c) === params.context);+ }++ private _findPage(params: { browser: string; context: string; page: string }): api.Page | undefined {+ const context = this._findContext(params);+ return context?.pages().find(p => pageId(p) === params.page);+ }++ private async _onPickLocator(page: api.Page) {+ await this._switchAttachedTo(page);this.emitPickLocator();}}-class AttachedBrowser {+class AttachedPage {private _owner: DashboardConnection;private _slot: BrowserSlot;-- private _selectedPage: api.Page | null = null;+ private _page: api.Page;+ private _listeners: Disposable[] = [];private _screencastRunning = false;private _recordingPath: string | null = null;- private _pageListeners: Disposable[] = [];- private _contextListeners: Disposable[] = [];- constructor(owner: DashboardConnection, slot: BrowserSlot) {+ constructor(owner: DashboardConnection, slot: BrowserSlot, page: api.Page) {this._owner = owner;this._slot = slot;+ this._page = page;}- get browserGuid(): string { return this._slot.guid; }- get contextGuid(): string { return this._slot.contextGuid; }- private get _context(): api.BrowserContext { return this._slot.context; }+ get page(): api.Page { return this._page; }private get _descriptor(): BrowserDescriptor { return this._slot.descriptor; }async init() {- this._contextListeners.push(- eventsHelper.addEventListener(this._context, 'page', page => {- if (!this._selectedPage)- this._selectPage(page).catch(() => {});+ this._listeners.push(+ eventsHelper.addEventListener(this._page, 'close', () => {+ this._owner._handleAttachedPageClose(this._page.context());+ }),+ eventsHelper.addEventListener(this._page, 'framenavigated', (frame: api.Frame) => {+ if (frame === this._page.mainFrame())+ this._owner._pushTabs();}),);- const pages = this._context.pages();- if (pages.length > 0)- await this._selectPage(pages[0]);+ this._owner._pushTabs();+ if (this._owner.visible()) {+ this._screencastRunning = true;+ await this._startScreencast(this._page);+ }}dispose() {- this._contextListeners.forEach(d => d.dispose());- this._contextListeners = [];- this._pageListeners.forEach(d => d.dispose());- this._pageListeners = [];- if (this._selectedPage && this._screencastRunning)- this._selectedPage.screencast.stop().catch(() => {});+ this._listeners.forEach(d => d.dispose());+ this._listeners = [];+ if (this._screencastRunning)+ this._page.screencast.stop().catch(() => {});this._screencastRunning = false;this._recordingPath = null;- this._selectedPage = null;- this._owner._pushTabs();- }-- selectedPage(): api.Page | null {- return this._selectedPage;}async setScreencastActive(active: boolean) {- if (!this._selectedPage)- return;if (active && !this._screencastRunning) {this._screencastRunning = true;- await this._startScreencast(this._selectedPage);+ await this._startScreencast(this._page);} else if (!active && this._screencastRunning) {this._screencastRunning = false;- await this._selectedPage.screencast.stop().catch(() => {});+ await this._page.screencast.stop().catch(() => {});}}- async selectPage(page: api.Page) {- await this._selectPage(page);- }-- async selectPageByGuid(guid: string) {- const page = this._context.pages().find(p => pageId(p) === guid);- if (page)- await this._selectPage(page);- }-async navigate(params: { url: string }) {if (!params.url)return;- await this._selectedPage?.goto(params.url);+ await this._page.goto(params.url);}async back() {- await this._selectedPage?.goBack();+ await this._page.goBack();}async forward() {- await this._selectedPage?.goForward();+ await this._page.goForward();}async reload() {- await this._selectedPage?.reload();+ await this._page.reload();}async mousemove(params: { x: number; y: number }) {- await this._selectedPage?.mouse.move(params.x, params.y);+ await this._page.mouse.move(params.x, params.y);}async mousedown(params: { x: number; y: number; button?: 'left' | 'middle' | 'right' }) {- const page = this._selectedPage;- if (!page)- return;- await page.mouse.move(params.x, params.y);- await page.mouse.down({ button: params.button || 'left' });+ await this._page.mouse.move(params.x, params.y);+ await this._page.mouse.down({ button: params.button || 'left' });}async mouseup(params: { x: number; y: number; button?: 'left' | 'middle' | 'right' }) {- const page = this._selectedPage;- if (!page)- return;- await page.mouse.move(params.x, params.y);- await page.mouse.up({ button: params.button || 'left' });+ await this._page.mouse.move(params.x, params.y);+ await this._page.mouse.up({ button: params.button || 'left' });}async wheel(params: { deltaX: number; deltaY: number }) {- await this._selectedPage?.mouse.wheel(params.deltaX, params.deltaY);+ await this._page.mouse.wheel(params.deltaX, params.deltaY);}async keydown(params: { key: string }) {- await this._selectedPage?.keyboard.down(params.key);+ await this._page.keyboard.down(params.key);}async keyup(params: { key: string }) {- await this._selectedPage?.keyboard.up(params.key);+ await this._page.keyboard.up(params.key);}async pickLocator() {- const page = this._selectedPage;- if (!page)- return;- const locator = await page.pickLocator();+ const locator = await this._page.pickLocator();this._owner.emitElementPicked(locator.toString(), await locator.ariaSnapshot());}async cancelPickLocator() {- await this._selectedPage?.cancelPickLocator();+ await this._page.cancelPickLocator();}async startRecording() {- const page = this._selectedPage;- if (!page)- return;const artifactsDir = this._descriptor.browser.launchOptions.artifactsDir ?? this._owner._recordingDir;this._recordingPath = path.join(artifactsDir, `recording-${Date.now()}.webm`);if (this._screencastRunning)- await this._restartScreencast(page);+ await this._restartScreencast(this._page);}async stopRecording(): Promise<{ streamId: string }> {@@ -529,8 +542,8 @@ class AttachedBrowser {if (!p)throw new Error('No recording in progress');this._recordingPath = null;- if (this._selectedPage && this._screencastRunning)- await this._restartScreencast(this._selectedPage);+ if (this._screencastRunning)+ await this._restartScreencast(this._page);const handle = await fs.promises.open(p, 'r');const streamId = crypto.randomUUID();this._owner._streams.set(streamId, { handle, path: p });@@ -538,49 +551,10 @@ class AttachedBrowser {}async screenshot(): Promise<string> {- const page = this._selectedPage;- if (!page)- throw new Error('No page selected');- const buffer = await page.screenshot({ type: 'png' });+ const buffer = await this._page.screenshot({ type: 'png' });return buffer.toString('base64');}- private async _selectPage(page: api.Page) {- if (this._selectedPage === page)- return;-- if (this._selectedPage) {- this._pageListeners.forEach(d => d.dispose());- this._pageListeners = [];- if (this._screencastRunning)- await this._selectedPage.screencast.stop();- this._screencastRunning = false;- this._recordingPath = null;- }-- this._selectedPage = page;- this._owner._pushTabs();-- this._pageListeners.push(- eventsHelper.addEventListener(page, 'close', () => {- this._deselectPage();- const pages = page.context().pages();- if (pages.length > 0)- this._selectPage(pages[0]).catch(() => {});- this._owner._pushTabs();- }),- eventsHelper.addEventListener(page, 'framenavigated', frame => {- if (frame === page.mainFrame())- this._owner._pushTabs();- }),- );-- if (this._owner.visible()) {- this._screencastRunning = true;- await this._startScreencast(page);- }- }-private async _startScreencast(page: api.Page) {await page.screencast.start({onFrame: ({ data }: { data: Buffer }) => this._owner.emitFrame(data.toString('base64'), page.viewportSize()?.width ?? 0, page.viewportSize()?.height ?? 0),@@ -594,18 +568,11 @@ class AttachedBrowser {await page.screencast.stop().catch(() => {});await this._startScreencast(page);}+}- private _deselectPage() {- if (!this._selectedPage)- return;- this._pageListeners.forEach(d => d.dispose());- this._pageListeners = [];- if (this._screencastRunning)- this._selectedPage.screencast.stop().catch(() => {});- this._screencastRunning = false;- this._recordingPath = null;- this._selectedPage = null;- }+function browserId(browser: api.Browser): string {+ // eslint-disable-next-line no-restricted-syntax -- _guid is very conservative.+ return (browser as any)._guid;}function pageId(p: api.Page): string {@@ -613,6 +580,11 @@ function pageId(p: api.Page): string {return (p as any)._guid;}+function contextId(c: api.BrowserContext): string {+ // eslint-disable-next-line no-restricted-syntax -- _guid is very conservative.+ return (c as any)._guid;+}+async function faviconUrl(page: api.Page): Promise<string | undefined> {const url = page.evaluate(async () => {const response = await fetch(document.querySelector<HTMLLinkElement>('link[rel~="icon"]')?.href ?? '/favicon.ico');diff --git a/tests/mcp/dashboard.spec.ts b/tests/mcp/dashboard.spec.tsindex 89f7be0639..a8a5c7f39b 100644--- a/tests/mcp/dashboard.spec.ts+++ b/tests/mcp/dashboard.spec.ts@@ -41,6 +41,29 @@ test('should show browser session chip', async ({ cli, server, startDashboardSerawait expect(chips).toHaveCount(1);});+test('should show placeholder chip for browser with no contexts', async ({ boundBrowser, startDashboardServer }) => {+ expect(boundBrowser.contexts()).toHaveLength(0);++ const dashboard = await startDashboardServer();+ const chips = dashboard.locator('.session-chip');+ await expect(chips).toHaveCount(1);+ await expect(chips.locator('.sidebar-tabs-empty')).toHaveText('No tabs open.');+ await expect(chips.locator('.sidebar-session-new-tab')).toHaveCount(0);+});++test('should show one row per context for a single browser', async ({ boundBrowser, server, startDashboardServer }) => {+ const contextA = await boundBrowser.newContext();+ const pageA = await contextA.newPage();+ await pageA.goto(server.EMPTY_PAGE);+ const contextB = await boundBrowser.newContext();+ const pageB = await contextB.newPage();+ await pageB.goto(server.EMPTY_PAGE);++ const dashboard = await startDashboardServer();+ const chips = dashboard.locator('.session-chip');+ await expect(chips).toHaveCount(2);+});+test('should show current workspace sessions first', async ({ cli, server, startDashboardServer }) => {const wsA = test.info().outputPath('workspace-a');const wsB = test.info().outputPath('workspace-b');