Skip to content

Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.

chore(cli): store session config (#39047)

Pavel Feldman8c5a5eeb72c0
diff --git a/packages/playwright/src/mcp/browser/config.ts b/packages/playwright/src/mcp/browser/config.ts
index aa69f31445..7c0eb9b6e2 100644
--- a/packages/playwright/src/mcp/browser/config.ts
+++ b/packages/playwright/src/mcp/browser/config.ts
@@ -168,7 +168,6 @@ export async function resolveCLIConfig(cliOptions: CLIOptions): Promise<FullConf
// No custom value provided, use the daemon data dir.
const browserToken = result.browser.launchOptions?.channel ?? result.browser?.browserName;
const userDataDir = `${cliOptions.daemonDataDir}-${browserToken}`;
- await fs.promises.mkdir(userDataDir, { recursive: true });
// Use default user profile with extension.
if (!result.extension)
diff --git a/packages/playwright/src/mcp/terminal/program.ts b/packages/playwright/src/mcp/terminal/program.ts
index 8b2a8f9f81..c2825cda66 100644
--- a/packages/playwright/src/mcp/terminal/program.ts
+++ b/packages/playwright/src/mcp/terminal/program.ts
@@ -115,12 +115,13 @@ class Session {
await this.stop();
const dataDirs = await fs.promises.readdir(daemonProfilesDir).catch(() => []);
- const matchingDirs = dataDirs.filter(dir => dir.startsWith(`ud-${this.name}-`));
- if (matchingDirs.length === 0) {
+ const matchingEntries = dataDirs.filter(file => file === `${this.name}.session` || file.startsWith(`ud-${this.name}-`));
+ if (matchingEntries.length === 0) {
console.log(`No user data found for session '${this.name}'.`);
return;
}
- for (const dir of matchingDirs) {
+
+ for (const dir of matchingEntries) {
const userDataDir = path.resolve(daemonProfilesDir, dir);
for (let i = 0; i < 5; i++) {
try {
@@ -215,6 +216,9 @@ class Session {
const isolatedArg = this._options.isolated ? [`--isolated`] : [];
const browserArg = this._options.browser ? [`--browser=${this._options.browser}`] : [];
+ const sessionOptionsFile = path.resolve(daemonProfilesDir, `${this.name}.session`);
+ await fs.promises.writeFile(sessionOptionsFile, JSON.stringify({ ...this._options, _: undefined }, null, 2));
+
const outLog = path.join(daemonProfilesDir, 'out.log');
const errLog = path.join(daemonProfilesDir, 'err.log');
const out = fs.openSync(outLog, 'w');
@@ -296,16 +300,24 @@ class SessionManager {
const sessions = new Map<string, Session>([
['default', new Session('default', options)],
]);
- try {
- const files = await fs.promises.readdir(dir);
- for (const file of files) {
+ const files = await fs.promises.readdir(dir).catch(() => []);
+ for (const file of files) {
+ try {
+ if (file.endsWith('.session')) {
+ const sessionName = path.basename(file, '.session');
+ sessions.set(sessionName, new Session(sessionName, options));
+ continue;
+ }
+
+ // Legacy session support.
if (file.startsWith('ud-')) {
// Session is like ud-<sessionName>-browserName
const sessionName = file.split('-')[1];
- sessions.set(sessionName, new Session(sessionName, options));
+ if (!sessions.has(sessionName))
+ sessions.set(sessionName, new Session(sessionName, options));
}
+ } catch {
}
- } catch {
}
return new SessionManager(sessions, options);
}
diff --git a/tests/mcp/cli.spec.ts b/tests/mcp/cli.spec.ts
index fe817a6caa..63fe965f18 100644
--- a/tests/mcp/cli.spec.ts
+++ b/tests/mcp/cli.spec.ts
@@ -602,9 +602,13 @@ test.describe('isolated', () => {
test('should not save user data', async ({ cli, server, mcpBrowser }, testInfo) => {
await cli('open', server.HELLO_WORLD, '--isolated');
const dataDir = testInfo.outputPath('daemon', 'ud-default-' + mcpBrowser);
- expect(fs.existsSync(dataDir)).toBe(true);
- const listFiles = await fs.promises.readdir(dataDir);
- expect(listFiles).toEqual([]);
+ expect(fs.existsSync(dataDir)).toBe(false);
+ const sessionFile = testInfo.outputPath('daemon', 'default.session');
+ expect(fs.existsSync(sessionFile)).toBe(true);
+ const sessionOptions = JSON.parse(await fs.promises.readFile(sessionFile, 'utf-8'));
+ expect(sessionOptions).toEqual(expect.objectContaining({
+ isolated: true,
+ }));
const { output: listOutput } = await cli('session-list');
expect(listOutput).toContain('Sessions:');