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
chore(cli): implement direct daemon startup (#39162)
Pavel Feldmane0e7f41e8024
diff --git a/packages/playwright/src/mcp/browser/browserContextFactory.ts b/packages/playwright/src/mcp/browser/browserContextFactory.tsindex fe79c2282a..4feb0835f2 100644--- a/packages/playwright/src/mcp/browser/browserContextFactory.ts+++ b/packages/playwright/src/mcp/browser/browserContextFactory.ts@@ -140,7 +140,7 @@ class IsolatedContextFactory extends BaseContextFactory {handleSIGTERM: false,}).catch(error => {if (error.message.includes('Executable doesn\'t exist'))- throw new Error(`Browser specified in your config is not installed. Either install it (likely) or change the config.`);+ throwBrowserIsNotInstalledError(this.config);throw error;});}@@ -227,7 +227,7 @@ class PersistentContextFactory implements BrowserContextFactory {return { browserContext, close };} catch (error: any) {if (error.message.includes('Executable doesn\'t exist'))- throw new Error(`Browser specified in your config is not installed. Either install it (likely) or change the config.`);+ throwBrowserIsNotInstalledError(this.config);if (error.message.includes('cannot open shared object file: No such file or directory')) {const browserName = launchOptions.channel ?? this.config.browser.browserName;throw new Error(`Missing system dependencies required to run browser ${browserName}. Install them with: sudo npx playwright install-deps ${browserName}`);@@ -368,3 +368,11 @@ async function browserContextOptionsFromConfig(config: FullConfig, clientInfo: C}return result;}++function throwBrowserIsNotInstalledError(config: FullConfig): never {+ const channel = config.browser.launchOptions?.channel ?? config.browser.browserName;+ if (config.skillMode)+ throw new Error(`Browser "${channel}" is not installed. Run \`playwright-cli install-browser ${channel}\` to install`);+ else+ throw new Error(`Browser "${channel}" is not installed. Either install it (likely) or change the config.`);+}diff --git a/packages/playwright/src/mcp/browser/browserServerBackend.ts b/packages/playwright/src/mcp/browser/browserServerBackend.tsindex 6812b32531..5a30c5a680 100644--- a/packages/playwright/src/mcp/browser/browserServerBackend.ts+++ b/packages/playwright/src/mcp/browser/browserServerBackend.ts@@ -34,9 +34,6 @@ export class BrowserServerBackend implements ServerBackend {private _config: FullConfig;private _browserContextFactory: BrowserContextFactory;- onBrowserContextClosed: (() => void) | undefined;- onBrowserLaunchFailed: ((error: Error) => void) | undefined;-constructor(config: FullConfig, factory: BrowserContextFactory, options: { allTools?: boolean, structuredOutput?: boolean } = {}) {this._config = config;this._browserContextFactory = factory;@@ -51,8 +48,6 @@ export class BrowserServerBackend implements ServerBackend {sessionLog: this._sessionLog,clientInfo,});- this._context.onBrowserContextClosed = () => this.onBrowserContextClosed?.();- this._context.onBrowserLaunchFailed = error => this.onBrowserLaunchFailed?.(error);}async listTools(): Promise<mcpServer.Tool[]> {diff --git a/packages/playwright/src/mcp/browser/context.ts b/packages/playwright/src/mcp/browser/context.tsindex e0dbd03e89..2f32e63484 100644--- a/packages/playwright/src/mcp/browser/context.ts+++ b/packages/playwright/src/mcp/browser/context.ts@@ -80,9 +80,6 @@ export class Context {private _runningToolName: string | undefined;private _abortController = new AbortController();- onBrowserContextClosed: (() => void) | undefined;- onBrowserLaunchFailed: ((error: Error) => void) | undefined;-constructor(options: ContextOptions) {this.config = options.config;this.sessionLog = options.sessionLog;@@ -289,9 +286,8 @@ export class Context {return this._browserContextPromise;this._browserContextPromise = this._setupBrowserContext();- this._browserContextPromise.catch(error => {+ this._browserContextPromise.catch(() => {this._browserContextPromise = undefined;- this.onBrowserLaunchFailed?.(error);});return this._browserContextPromise;}@@ -313,7 +309,6 @@ export class Context {for (const page of browserContext.pages())this._onPageCreated(page);browserContext.on('page', page => this._onPageCreated(page));- browserContext.on('close', () => this.onBrowserContextClosed?.());if (this.config.saveTrace) {await (browserContext.tracing as Tracing).start({name: 'trace-' + Date.now(),diff --git a/packages/playwright/src/mcp/extension/cdpRelay.ts b/packages/playwright/src/mcp/extension/cdpRelay.tsindex 927fa96536..639ac1c35e 100644--- a/packages/playwright/src/mcp/extension/cdpRelay.ts+++ b/packages/playwright/src/mcp/extension/cdpRelay.ts@@ -108,7 +108,7 @@ export class CDPRelayServer {await Promise.race([this._extensionConnectionPromise,new Promise((_, reject) => setTimeout(() => {- reject(new Error(`Extension connection timeout. Make sure the "Playwright MCP Bridge" extension is installed. See https://github.com/microsoft/playwright-mcp/blob/main/extension/README.md for installation instructions.`));+ reject(new Error(`Extension connection timeout. Make sure the "Playwright MCP Bridge" extension is installed. See https://github.com/microsoft/playwright-mcp/blob/main/packages/extension/README.md for installation instructions.`));}, process.env.PWMCP_TEST_CONNECTION_TIMEOUT ? parseInt(process.env.PWMCP_TEST_CONNECTION_TIMEOUT, 10) : 5_000)),new Promise((_, reject) => abortSignal.addEventListener('abort', reject))]);diff --git a/packages/playwright/src/mcp/program.ts b/packages/playwright/src/mcp/program.tsindex ce34ad93b7..b91650fd7f 100644--- a/packages/playwright/src/mcp/program.ts+++ b/packages/playwright/src/mcp/program.ts@@ -110,18 +110,18 @@ export function decorateCommand(command: Command, version: string) {if (config.sessionConfig) {const contextFactory = config.extension ? extensionContextFactory : browserContextFactory;- const serverBackendFactory: mcpServer.ServerBackendFactory = {- name: 'Playwright',- nameInConfig: 'playwright-daemon',- version,- create: () => new BrowserServerBackend(config, contextFactory, { allTools: true })- };- console.error(`### Config`);- console.error('```json');- console.error(JSON.stringify(config, null, 2));- console.error('```');- const socketPath = await startMcpDaemonServer(config.sessionConfig, serverBackendFactory);- console.error(`Daemon server listening on ${socketPath}`);+ console.log(`### Config`);+ console.log('```json');+ console.log(JSON.stringify(config, null, 2));+ console.log('```');+ try {+ const socketPath = await startMcpDaemonServer(config, contextFactory);+ console.log(`### Success\nDaemon listening on ${socketPath}`);+ console.log('<EOF>');+ } catch (error) {+ console.log(`### Error\n${error.message}`);+ console.log('<EOF>');+ }return;}diff --git a/packages/playwright/src/mcp/sdk/server.ts b/packages/playwright/src/mcp/sdk/server.tsindex 6fa53cf1a4..9346c720a8 100644--- a/packages/playwright/src/mcp/sdk/server.ts+++ b/packages/playwright/src/mcp/sdk/server.ts@@ -47,8 +47,6 @@ export interface ServerBackend {listTools(): Promise<Tool[]>;callTool(name: string, args: CallToolRequest['params']['arguments'], progress: ProgressCallback): Promise<CallToolResult>;serverClosed?(server: Server): void;- onBrowserContextClosed?: (() => void) | undefined;- onBrowserLaunchFailed?: ((error: Error) => void) | undefined;}export type ServerBackendFactory = {diff --git a/packages/playwright/src/mcp/terminal/DEPS.list b/packages/playwright/src/mcp/terminal/DEPS.listindex c83f31a2da..e67b7fc131 100644--- a/packages/playwright/src/mcp/terminal/DEPS.list+++ b/packages/playwright/src/mcp/terminal/DEPS.list@@ -1,4 +1,5 @@[daemon.ts]+../browser/browserServerBackend.ts../browser/tools../cli/socketConnection.tsdiff --git a/packages/playwright/src/mcp/terminal/daemon.ts b/packages/playwright/src/mcp/terminal/daemon.tsindex 2a70de6af1..4a1cf9abd5 100644--- a/packages/playwright/src/mcp/terminal/daemon.ts+++ b/packages/playwright/src/mcp/terminal/daemon.ts@@ -23,13 +23,14 @@ import url from 'url';import { debug } from 'playwright-core/lib/utilsBundle';import { gracefullyProcessExitDoNotHang } from 'playwright-core/lib/utils';+import { BrowserServerBackend } from '../browser/browserServerBackend';import { SocketConnection } from './socketConnection';import { commands } from './commands';import { parseCommand } from './command';-import type { ServerBackendFactory } from '../sdk/server';import type * as mcp from '../sdk/exports';-import type { SessionConfig } from './program';+import type { BrowserContextFactory } from '../browser/browserContextFactory';+import type { FullConfig } from '../browser/config';const daemonDebug = debug('pw:daemon');@@ -44,9 +45,10 @@ async function socketExists(socketPath: string): Promise<boolean> {}export async function startMcpDaemonServer(- sessionConfig: SessionConfig,- serverBackendFactory: ServerBackendFactory,+ config: FullConfig,+ contextFactory: BrowserContextFactory,): Promise<string> {+ const sessionConfig = config.sessionConfig!;const { socketPath, version } = sessionConfig;// Clean up existing socket file on Unixif (os.platform() !== 'win32' && await socketExists(socketPath)) {@@ -59,9 +61,8 @@ export async function startMcpDaemonServer(}}- const backend = serverBackendFactory.create();const cwd = url.pathToFileURL(process.cwd()).href;- await backend.initialize?.({+ const clientInfo = {name: 'playwright-cli',version: sessionConfig.version,roots: [{@@ -69,11 +70,21 @@ export async function startMcpDaemonServer(name: 'cwd'}],timestamp: Date.now(),+ };++ const { browserContext, close } = await contextFactory.createContext(clientInfo, new AbortController().signal, {});+ browserContext.on('close', () => {+ daemonDebug('browser closed, shutting down daemon');+ shutdown(0);});- await fs.mkdir(path.dirname(socketPath), { recursive: true });+ const existingContextFactory = {+ createContext: () => Promise.resolve({ browserContext, close }),+ };+ const backend = new BrowserServerBackend(config, existingContextFactory, { allTools: true });+ await backend.initialize?.(clientInfo);- let shutdownPending = false;+ await fs.mkdir(path.dirname(socketPath), { recursive: true });const shutdown = (exitCode: number) => {daemonDebug(`shutting down daemon with exit code ${exitCode}`);@@ -101,32 +112,18 @@ export async function startMcpDaemonServer(const { toolName, toolParams } = parseCliCommand(params.args);if (params.cwd)toolParams._meta = { cwd: params.cwd };- const response = await backend.callTool(toolName, toolParams, () => {});+ const response = await backend.callTool(toolName, toolParams);await connection.send({ id, result: formatResult(response) });- if (shutdownPending)- shutdown(1);} else {throw new Error(`Unknown method: ${method}`);}} catch (e) {daemonDebug('command failed', e);await connection.send({ id, error: (e as Error).message });- if (shutdownPending)- shutdown(1);}};});- backend.onBrowserContextClosed = () => {- daemonDebug('browser closed, shutting down daemon');- shutdown(0);- };-- backend.onBrowserLaunchFailed = error => {- daemonDebug('browser launch failed, will shut down after response', error);- shutdownPending = true;- };-return new Promise((resolve, reject) => {server.on('error', (error: NodeJS.ErrnoException) => {daemonDebug(`server error: ${error.message}`);diff --git a/packages/playwright/src/mcp/terminal/helpGenerator.ts b/packages/playwright/src/mcp/terminal/helpGenerator.tsindex d60edd1a53..96fc9a6995 100644--- a/packages/playwright/src/mcp/terminal/helpGenerator.ts+++ b/packages/playwright/src/mcp/terminal/helpGenerator.ts@@ -81,7 +81,7 @@ const categories: { name: Category, title: string }[] = [export function generateHelp() {const lines: string[] = [];lines.push('Usage: playwright-cli <command> [args] [options]');- lines.push('Usage: playwright-cli -b=<session> <command> [args] [options]');+ lines.push('Usage: playwright-cli -s=<session> <command> [args] [options]');const commandsByCategory = new Map<string, AnyCommandSchema[]>();for (const c of categories)diff --git a/packages/playwright/src/mcp/terminal/program.ts b/packages/playwright/src/mcp/terminal/program.tsindex a31dfec228..f9ea03c16f 100644--- a/packages/playwright/src/mcp/terminal/program.ts+++ b/packages/playwright/src/mcp/terminal/program.ts@@ -94,15 +94,16 @@ to restart the session daemon.`);return await this._send('run', { args, cwd: process.cwd() });}- async stop(): Promise<void> {+ async stop(quiet: boolean = false): Promise<void> {if (!await this.canConnect()) {- console.log(`Browser '${this.name}' is not open.`);+ if (!quiet)+ console.log(`Browser '${this.name}' is not open.`);return;}await this._stopDaemon();- console.log(`Browser '${this.name}' closed`);- console.log('');+ if (!quiet)+ console.log(`Browser '${this.name}' closed\n`);}private async _send(method: string, params: any = {}): Promise<any> {@@ -226,9 +227,7 @@ to restart the session daemon.`);this._config.version = this._clientInfo.version;await fs.promises.writeFile(sessionConfigFile, JSON.stringify(this._config, null, 2));- const outLog = this._sessionFile('.out');const errLog = this._sessionFile('.err');- const out = fs.openSync(outLog, 'w');const err = fs.openSync(errLog, 'w');const args = [@@ -239,53 +238,67 @@ to restart the session daemon.`);const child = spawn(process.execPath, args, {detached: true,- stdio: ['ignore', out, err],+ stdio: ['ignore', 'pipe', err],cwd: process.cwd(), // Will be used as root.});- child.unref();- // Wait for the socket to become available with retries.- const retryDelay = [100, 200, 400]; // ms- let totalWaited = 0;- for (let i = 0; i < 10; i++) {- await new Promise(resolve => setTimeout(resolve, retryDelay[i] || 1000));- totalWaited += retryDelay[i] || 1000;- try {- const { socket } = await this._connect();- if (socket) {- console.log(`### Browser \`${this.name}\` opened with pid ${child.pid}.`);- const resolvedConfig = await parseResolvedConfig(errLog);- if (resolvedConfig) {- this._config.resolvedConfig = resolvedConfig;- console.log(`- ${this.name}:`);- console.log(renderResolvedConfig(resolvedConfig).join('\n'));- }- const sessionOption = this.name !== 'default' ? ` -b ${this.name}` : '';- console.log(``);- console.log(`\`\`\`bash`);- console.log(formatWithGap(`> playwright-cli${sessionOption} close`, `# to close when done`));- console.log(formatWithGap(`> playwright-cli${sessionOption} open [options]`, `# to reopen with new config`));- console.log(formatWithGap(`> playwright-cli${sessionOption} delete-data`, `# to delete profile data dir`));- console.log(`\`\`\``);- console.log(``);-- await fs.promises.writeFile(sessionConfigFile, JSON.stringify(this._config, null, 2));- return socket;+ let signalled = false;+ const sigintHandler = () => {+ signalled = true;+ child.kill('SIGINT');+ };+ const sigtermHandler = () => {+ signalled = true;+ child.kill('SIGTERM');+ };+ process.on('SIGINT', sigintHandler);+ process.on('SIGTERM', sigtermHandler);++ let outLog = '';+ await new Promise<void>((resolve, reject) => {+ child.stdout!.on('data', data => {+ outLog += data.toString();+ if (!outLog.includes('<EOF>'))+ return;+ const errorMatch = outLog.match(/### Error\n([\s\S]*)<EOF>/);+ const error = errorMatch ? errorMatch[1].trim() : undefined;+ if (error) {+ const errLogContent = fs.readFileSync(errLog, 'utf-8');+ const message = error + (errLogContent ? '\n' + errLogContent : '');+ reject(new Error(message));}- } catch (e) {- if (e.code !== 'ENOENT' && e.code !== 'ECONNREFUSED')- throw e;++ const successMatch = outLog.match(/### Success\nDaemon listening on (.*)\n<EOF>/);+ if (successMatch)+ resolve();+ });+ child.on('close', code => {+ if (!signalled)+ reject(new Error(`Daemon process exited with code ${code}`));+ });+ });++ process.off('SIGINT', sigintHandler);+ process.off('SIGTERM', sigtermHandler);+ child.stdout!.destroy();+ child.unref();++ const { socket } = await this._connect();+ if (socket) {+ console.log(`### Browser \`${this.name}\` opened with pid ${child.pid}.`);+ const resolvedConfig = await parseResolvedConfig(outLog);+ if (resolvedConfig) {+ this._config.resolvedConfig = resolvedConfig;+ console.log(`- ${this.name}:`);+ console.log(renderResolvedConfig(resolvedConfig).join('\n'));}- }+ console.log(`---`);- const outData = await fs.promises.readFile(outLog, 'utf-8').catch(() => '');- const errData = await fs.promises.readFile(errLog, 'utf-8').catch(() => '');+ await fs.promises.writeFile(sessionConfigFile, JSON.stringify(this._config, null, 2));+ return socket;+ }- console.error(`Failed to connect to daemon at ${this._config.socketPath} after ${totalWaited}ms`);- if (outData.length)- console.log(outData);- if (errData.length)- console.error(errData);+ console.error(`Failed to connect to daemon at ${this._config.socketPath}`);process.exit(1);}@@ -337,7 +350,7 @@ class SessionManager {const sessionName = this._resolveSessionName(args.session);let session = this.sessions.get(sessionName);if (session)- await session.stop();+ await session.stop(true);session = new Session(this.clientInfo, sessionName, sessionConfigFromArgs(this.clientInfo, sessionName, args));this.sessions.set(sessionName, session);@@ -350,7 +363,7 @@ class SessionManager {if (!session) {console.log(`The browser '${sessionName}' is not open, please run open first`);console.log('');- console.log(` playwright-cli${sessionName !== 'default' ? ` -b ${sessionName}` : ''} open [params]`);+ console.log(` playwright-cli${sessionName !== 'default' ? ` -s=${sessionName}` : ''} open [params]`);process.exit(1);}@@ -487,10 +500,10 @@ export async function program(packageLocation: string) {if (!argv.includes(`--${option}`) && !argv.includes(`--no-${option}`))delete args[option];}- // Normalize -b alias to --session- if (args.b) {- args.session = args.b;- delete args.b;+ // Normalize -s alias to --session+ if (args.s) {+ args.session = args.s;+ delete args.s;}const help = require('./help.json');@@ -531,7 +544,7 @@ export async function program(packageLocation: string) {case 'close-all': {const sessions = sessionManager.sessions;for (const session of sessions.values())- await session.stop();+ await session.stop(true);return;}case 'delete-data':@@ -815,22 +828,16 @@ function renderResolvedConfig(resolvedConfig: FullConfig) {return lines;}-function formatWithGap(prefix: string, text: string, threshold: number = 40) {- const indent = Math.max(1, threshold - prefix.length);- return prefix + ' '.repeat(indent) + text;-}--async function parseResolvedConfig(logFile: string): Promise<FullConfig | null> {- const logData = await fs.promises.readFile(logFile, 'utf-8').catch(() => '');+async function parseResolvedConfig(errLog: string): Promise<FullConfig | null> {const marker = '### Config\n```json\n';- const markerIndex = logData.indexOf(marker);+ const markerIndex = errLog.indexOf(marker);if (markerIndex === -1)return null;const jsonStart = markerIndex + marker.length;- const jsonEnd = logData.indexOf('\n```', jsonStart);+ const jsonEnd = errLog.indexOf('\n```', jsonStart);if (jsonEnd === -1)throw null;- const jsonString = logData.substring(jsonStart, jsonEnd).trim();+ const jsonString = errLog.substring(jsonStart, jsonEnd).trim();try {return JSON.parse(jsonString) as FullConfig;} catch {diff --git a/packages/playwright/src/skill/SKILL.md b/packages/playwright/src/skill/SKILL.mdindex 18ab060b31..847a176489 100644--- a/packages/playwright/src/skill/SKILL.md+++ b/packages/playwright/src/skill/SKILL.md@@ -184,10 +184,10 @@ playwright-cli delete-data### Browser Sessions```bash-playwright-cli -b mysession open example.com-playwright-cli -b mysession click e6-playwright-cli -b mysession close # stop a named browser-playwright-cli -b mysession delete-data # delete user data for named browser+playwright-cli -s=mysession open example.com+playwright-cli -s=mysession click e6+playwright-cli -s=mysession close # stop a named browser+playwright-cli -s=mysession delete-data # delete user data for named browserplaywright-cli list# Close all browsersdiff --git a/packages/playwright/src/skill/references/session-management.md b/packages/playwright/src/skill/references/session-management.mdindex dd685a00a2..08c8c90c50 100644--- a/packages/playwright/src/skill/references/session-management.md+++ b/packages/playwright/src/skill/references/session-management.md@@ -8,14 +8,14 @@ Use `-b` flag to isolate browser contexts:```bash# Browser 1: Authentication flow-playwright-cli -b auth open https://app.example.com/login+playwright-cli -s=auth open https://app.example.com/login# Browser 2: Public browsing (separate cookies, storage)-playwright-cli -b public open https://example.com+playwright-cli -s=public open https://example.com# Commands are isolated by browser session-playwright-cli -b auth fill e1 "[email protected]"-playwright-cli -b public snapshot+playwright-cli -s=auth fill e1 "[email protected]"+playwright-cli -s=public snapshot```## Browser Session Isolation Properties@@ -36,7 +36,7 @@ playwright-cli list# Stop a browser session (close the browser)playwright-cli close # stop the default browser-playwright-cli -b mysession close # stop a named browser+playwright-cli -s=mysession close # stop a named browser# Stop all browser sessionsplaywright-cli close-all@@ -46,7 +46,7 @@ playwright-cli kill-all# Delete browser session user data (profile directory)playwright-cli delete-data # delete default browser data-playwright-cli -b mysession delete-data # delete named browser data+playwright-cli -s=mysession delete-data # delete named browser data```## Environment Variable@@ -67,15 +67,15 @@ playwright-cli open example.com # Uses "mysession" automatically# Scrape multiple sites concurrently# Start all browsers-playwright-cli -b site1 open https://site1.com &-playwright-cli -b site2 open https://site2.com &-playwright-cli -b site3 open https://site3.com &+playwright-cli -s=site1 open https://site1.com &+playwright-cli -s=site2 open https://site2.com &+playwright-cli -s=site3 open https://site3.com &wait# Take snapshots from each-playwright-cli -b site1 snapshot-playwright-cli -b site2 snapshot-playwright-cli -b site3 snapshot+playwright-cli -s=site1 snapshot+playwright-cli -s=site2 snapshot+playwright-cli -s=site3 snapshot# Cleanupplaywright-cli close-all@@ -85,12 +85,12 @@ playwright-cli close-all```bash# Test different user experiences-playwright-cli -b variant-a open "https://app.com?variant=a"-playwright-cli -b variant-b open "https://app.com?variant=b"+playwright-cli -s=variant-a open "https://app.com?variant=a"+playwright-cli -s=variant-b open "https://app.com?variant=b"# Compare-playwright-cli -b variant-a screenshot-playwright-cli -b variant-b screenshot+playwright-cli -s=variant-a screenshot+playwright-cli -s=variant-b screenshot```### Persistent Profile@@ -107,7 +107,7 @@ playwright-cli open https://example.com --profile=/path/to/profile## Default Browser Session-When `-b` is omitted, commands use the default browser session:+When `-s` is omitted, commands use the default browser session:```bash# These use the same default browser session@@ -140,19 +140,19 @@ playwright-cli open https://example.com --persistent```bash# GOOD: Clear purpose-playwright-cli -b github-auth open https://github.com-playwright-cli -b docs-scrape open https://docs.example.com+playwright-cli -s=github-auth open https://github.com+playwright-cli -s=docs-scrape open https://docs.example.com# AVOID: Generic names-playwright-cli -b s1 open https://github.com+playwright-cli -s=s1 open https://github.com```### 2. Always Clean Up```bash# Stop browsers when done-playwright-cli -b auth close-playwright-cli -b scrape close+playwright-cli -s=auth close+playwright-cli -s=scrape close# Or stop all at onceplaywright-cli close-all@@ -165,5 +165,5 @@ playwright-cli kill-all```bash# Remove old browser data to free disk space-playwright-cli -b oldsession delete-data+playwright-cli -s=oldsession delete-data```diff --git a/tests/mcp/cli-isolated.spec.ts b/tests/mcp/cli-isolated.spec.tsindex a67c540f94..236f1e6e34 100644--- a/tests/mcp/cli-isolated.spec.ts+++ b/tests/mcp/cli-isolated.spec.ts@@ -36,7 +36,7 @@ test('should not save user data by default (in-memory mode)', async ({ cli, servexpect(listOutput).toContain(`### Browsers- default:- status: open- - browser-type: chrome+ - browser-type: ${mcpBrowser}- user-data-dir: <in-memory>- headed: false`);});diff --git a/tests/mcp/cli-misc.spec.ts b/tests/mcp/cli-misc.spec.tsindex 6bb430ef8b..745f1302c5 100644--- a/tests/mcp/cli-misc.spec.ts+++ b/tests/mcp/cli-misc.spec.ts@@ -20,7 +20,7 @@ import { test, expect } from './cli-fixtures';test('daemon shuts down on browser launch failure', async ({ cli, server }) => {const first = await cli('open', server.PREFIX, { env: { PLAYWRIGHT_MCP_EXECUTABLE_PATH: '/nonexistent/browser/path' } });- expect(first.output).toContain('Failed to launch');+ expect(first.error).toContain(`executable doesn't exist`);const second = await cli('open', server.PREFIX);expect(second.exitCode).toBe(0);diff --git a/tests/mcp/cli-session.spec.ts b/tests/mcp/cli-session.spec.tsindex 545d4e0745..e4fb496ed2 100644--- a/tests/mcp/cli-session.spec.ts+++ b/tests/mcp/cli-session.spec.ts@@ -41,14 +41,14 @@ test('close', async ({ cli, server }) => {});test('close named session', async ({ cli, server }) => {- await cli('-b', 'mysession', 'open', server.HELLO_WORLD);+ await cli('-s', 'mysession', 'open', server.HELLO_WORLD);- const { output } = await cli('-b', 'mysession', 'close');+ const { output } = await cli('-s', 'mysession', 'close');expect(output).toContain(`Browser 'mysession' closed`);});test('close non-running session', async ({ cli }) => {- const { output } = await cli('-b', 'nonexistent', 'close');+ const { output } = await cli('-s', 'nonexistent', 'close');expect(output).toContain(`Browser 'nonexistent' is not open.`);});@@ -66,8 +66,8 @@ test('persistent session shows in list after close', async ({ cli, server }) =>});test('close-all', async ({ cli, server }) => {- await cli('-b', 'session1', 'open', server.HELLO_WORLD);- await cli('-b', 'session2', 'open', server.HELLO_WORLD);+ await cli('-s', 'session1', 'open', server.HELLO_WORLD);+ await cli('-s', 'session2', 'open', server.HELLO_WORLD);const { output: listBefore } = await cli('list');expect(listBefore).toContain('session1');@@ -92,19 +92,19 @@ test('delete-data', async ({ cli, server, mcpBrowser }, testInfo) => {});test('delete-data named session', async ({ cli, server, mcpBrowser }, testInfo) => {- await cli('-b', 'mysession', 'open', server.HELLO_WORLD, '--persistent');+ await cli('-s', 'mysession', 'open', server.HELLO_WORLD, '--persistent');const dataDir = path.resolve(await daemonFolder(), 'ud-mysession-' + mcpBrowser);expect(fs.existsSync(dataDir)).toBe(true);- const { output } = await cli('-b', 'mysession', 'delete-data');+ const { output } = await cli('-s', 'mysession', 'delete-data');expect(output).toContain(`Deleted user data for browser 'mysession'.`);expect(fs.existsSync(dataDir)).toBe(false);});test('delete-data non-existent session', async ({ cli }) => {- const { output } = await cli('-b', 'nonexistent', 'delete-data');+ const { output } = await cli('-s', 'nonexistent', 'delete-data');expect(output).toContain(`No user data found for browser 'nonexistent'.`);});@@ -192,8 +192,8 @@ test('list --all lists sessions from all workspaces', async ({ cli, server }, teawait cli('install', { cwd: workspace2 });// Open sessions in both workspaces- await cli('-b', 'session1', 'open', server.HELLO_WORLD, { cwd: workspace1 });- await cli('-b', 'session2', 'open', server.HELLO_WORLD, { cwd: workspace2 });+ await cli('-s', 'session1', 'open', server.HELLO_WORLD, { cwd: workspace1 });+ await cli('-s', 'session2', 'open', server.HELLO_WORLD, { cwd: workspace2 });// List all sessions from workspace1const { output: allList } = await cli('list', '--all', { cwd: workspace1 });@@ -204,6 +204,6 @@ test('list --all lists sessions from all workspaces', async ({ cli, server }, teexpect(allList).toContain('session1');expect(allList).toContain('session2');- await cli('-b', 'session1', 'close', { cwd: workspace1 });- await cli('-b', 'session2', 'close', { cwd: workspace2 });+ await cli('-s', 'session1', 'close', { cwd: workspace1 });+ await cli('-s', 'session2', 'close', { cwd: workspace2 });});