[pull] main from microsoft:main

packages/playwright-core/src/server/firefox/ffPage.ts

@@ -239,11 +239,18 @@ export class FFPage implements PageDelegate {
   }
 
   _onNavigationCommitted(params: Protocol.Page.navigationCommittedPayload) {
+    if (!params.navigationId) {
+      // Firefox replays the current navigation without a navigationId during a process swap (e.g. when restoring a persistent profile).
+      // Treat these as same-document URL updates so they don't interrupt any in-flight new-document navigation in Frame.gotoImpl.
+      this._page.frameManager.frameCommittedSameDocumentNavigation(params.frameId, params.url);
+      return;
+    }
+
     for (const [workerId, worker] of this._workers) {
       if (worker.frameId === params.frameId)
         this._onWorkerDestroyed({ workerId });
     }
-    this._page.frameManager.frameCommittedNewDocumentNavigation(params.frameId, params.url, params.name || '', params.navigationId || '', false);
+    this._page.frameManager.frameCommittedNewDocumentNavigation(params.frameId, params.url, params.name || '', params.navigationId, false);
   }
 
   _onSameDocumentNavigation(params: Protocol.Page.sameDocumentNavigationPayload) {

packages/playwright-core/src/tools/backend/sessionLog.ts

@@ -17,6 +17,8 @@
 import fs from 'fs';
 import path from 'path';
 
+import debug from 'debug';
+
 import { outputFile  } from './context';
 import { parseResponse } from './response';
 
@@ -60,6 +62,6 @@ export class SessionLog {
     }
 
     lines.push('');
-    this._sessionFileQueue = this._sessionFileQueue.then(() => fs.promises.appendFile(this._file, lines.join('\n')));
+    this._sessionFileQueue = this._sessionFileQueue.then(() => fs.promises.appendFile(this._file, lines.join('\n'))).catch(e => debug('pw:tools:error')(e));
   }
 }

tests/library/defaultbrowsercontext-2.spec.ts

@@ -142,6 +142,23 @@ it('should create userDataDir if it does not exist', async ({ createUserDataDir,
   expect(fs.readdirSync(userDataDir).length).toBeGreaterThan(0);
 });
 
+it('should goto about:blank on relaunched persistent context', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/41216' },
+}, async ({ browserType, createUserDataDir }) => {
+  const userDataDir = await createUserDataDir();
+
+  const context1 = await browserType.launchPersistentContext(userDataDir);
+  await context1.pages()[0].goto('about:blank');
+  await context1.close();
+
+  // When relaunching with an existing profile, Firefox session restore can race with the user's goto and cause "interrupted by another navigation".
+  // This issue is timing-sensitive and might not fire on every run, so rely on CI's --repeat-each matrix for coverage.
+  const context2 = await browserType.launchPersistentContext(userDataDir);
+  await context2.pages()[0].goto('about:blank');
+  expect(context2.pages()[0].url()).toBe('about:blank');
+  await context2.close();
+});
+
 it('should have default URL when launching browser', async ({ launchPersistent }) => {
   const { context } = await launchPersistent();
   const urls = context.pages().map(page => page.url());

tests/mcp/session-log.spec.ts

@@ -84,6 +84,53 @@ test('session log should record tool calls', async ({ startClient, server, mcpBr
 `.trim()));
 });
 
+test('session log should recover after write failure', async ({ startClient, server, mcpBrowser }, testInfo) => {
+  test.skip(mcpBrowser === 'webkit');
+
+  const { client, stderr } = await startClient({
+    args: [
+      '--save-session',
+      '--output-dir', testInfo.outputPath('output'),
+    ],
+  });
+
+  server.setContent('/', `<title>Title</title><button>Submit</button>`, 'text/html');
+
+  // First call: logs successfully.
+  await client.callTool({
+    name: 'browser_navigate',
+    arguments: { url: server.PREFIX },
+  });
+
+  const output = stderr().split('\n').filter(line => line.startsWith('Session: '))[0];
+  const sessionFolder = output.substring('Session: '.length);
+  const sessionFile = path.join(sessionFolder, 'session.md');
+
+  // Wait for the first entry to be written.
+  await expect.poll(() => readSessionLog(sessionFolder)).toContain('browser_navigate');
+
+  // Make the session file read-only so the next write fails.
+  await fs.promises.chmod(sessionFile, 0o444);
+
+  // Second call: write fails (EACCES) but the chain should recover.
+  await client.callTool({
+    name: 'browser_click',
+    arguments: { element: 'Submit button', target: 'e2' },
+  });
+
+  // Restore write permission.
+  await fs.promises.chmod(sessionFile, 0o644);
+
+  // Third call: without the fix the chain stays rejected and this is never logged.
+  await client.callTool({
+    name: 'browser_click',
+    arguments: { element: 'Submit button', target: 'e2' },
+  });
+
+  // Verify the third call was logged (chain recovered).
+  await expect.poll(() => readSessionLog(sessionFolder)).toContain('browser_click');
+});
+
 async function readSessionLog(sessionFolder: string): Promise<string> {
   return await fs.promises.readFile(path.join(sessionFolder, 'session.md'), 'utf8').catch(() => '');
 }