playwriter 0.0.20 → 0.0.22

package/src/mcp.ts

@@ -15,6 +15,13 @@ import { getCdpUrl, LOG_FILE_PATH } from './utils.js'
 import { waitForPageLoad, WaitForPageLoadOptions, WaitForPageLoadResult } from './wait-for-page-load.js'
 import { getCDPSessionForPage, CDPSession } from './cdp-session.js'
 
+class CodeExecutionTimeoutError extends Error {
+  constructor(timeout: number) {
+    super(`Code execution timed out after ${timeout}ms`)
+    this.name = 'CodeExecutionTimeoutError'
+  }
+}
+
 const require = createRequire(import.meta.url)
 
 const usefulGlobals = {
@@ -94,8 +101,6 @@ const cdpSessionCache: WeakMap<Page, CDPSession> = new WeakMap()
 const RELAY_PORT = 19988
 const NO_TABS_ERROR = `No browser tabs are connected. Please install and enable the Playwriter extension on at least one tab: https://chromewebstore.google.com/detail/playwriter-mcp/jfeammnjpkecdekppnclgkkffahnhfhe`
 
-
-
 async function setDeviceScaleFactorForMacOS(context: BrowserContext): Promise<void> {
   if (os.platform() !== 'darwin') {
     return
@@ -113,8 +118,25 @@ async function setDeviceScaleFactorForMacOS(context: BrowserContext): Promise<vo
   }
 }
 
+async function preserveSystemColorScheme(context: BrowserContext): Promise<void> {
+  const options = (context as any)._options
+  if (!options) {
+    return
+  }
+  options.colorScheme = 'no-override'
+  options.reducedMotion = 'no-override'
+  options.forcedColors = 'no-override'
+  await Promise.all(
+    context.pages().map((page) => {
+      return page.emulateMedia({ colorScheme: null, reducedMotion: null, forcedColors: null }).catch(() => {})
+    }),
+  )
+}
+
 function isRegExp(value: any): value is RegExp {
-  return typeof value === 'object' && value !== null && typeof value.test === 'function' && typeof value.exec === 'function'
+  return (
+    typeof value === 'object' && value !== null && typeof value.test === 'function' && typeof value.exec === 'function'
+  )
 }
 
 function clearUserState() {
@@ -209,6 +231,7 @@ async function ensureConnection(): Promise<{ browser: Browser; page: Page }> {
   // Set up console listener for all existing pages
   context.pages().forEach((p) => setupPageConsoleListener(p))
 
+  await preserveSystemColorScheme(context)
   await setDeviceScaleFactorForMacOS(context)
 
   state.browser = browser
@@ -246,31 +269,32 @@ function setupPageConsoleListener(page: Page) {
     browserLogs.set(targetId, [])
   }
 
-  // Clear logs on navigation/reload
   page.on('framenavigated', (frame) => {
-    // Only clear if it's the main frame navigating (page reload/navigation)
     if (frame === page.mainFrame()) {
       browserLogs.set(targetId, [])
     }
   })
 
-  // Delete logs when page is closed
   page.on('close', () => {
     browserLogs.delete(targetId)
   })
 
   page.on('console', (msg) => {
-    const logEntry = `[${msg.type()}] ${msg.text()}`
+    try {
+      let logEntry = `[${msg.type()}] ${msg.text()}`
 
-    // Get or create logs array for this page targetId
-    if (!browserLogs.has(targetId)) {
-      browserLogs.set(targetId, [])
-    }
-    const pageLogs = browserLogs.get(targetId)!
+      if (!browserLogs.has(targetId)) {
+        browserLogs.set(targetId, [])
+      }
+      const pageLogs = browserLogs.get(targetId)!
 
-    pageLogs.push(logEntry)
-    if (pageLogs.length > MAX_LOGS_PER_PAGE) {
-      pageLogs.shift()
+      pageLogs.push(logEntry)
+      if (pageLogs.length > MAX_LOGS_PER_PAGE) {
+        pageLogs.shift()
+      }
+    } catch (e) {
+      console.error('[MCP] Failed to get console message text:', e)
+      return
     }
   })
 }
@@ -287,8 +311,7 @@ async function getCurrentPage(timeout = 5000) {
 
       if (pages.length > 0) {
         const page = pages[0]
-        page.waitForEvent('load', { timeout })
-        await page.emulateMedia({ colorScheme: null })
+        await page.waitForLoadState('load', { timeout }).catch(() => {})
         return page
       }
     }
@@ -334,6 +357,7 @@ async function resetConnection(): Promise<{ browser: Browser; page: Page; contex
   // Set up console listener for all existing pages
   context.pages().forEach((p) => setupPageConsoleListener(p))
 
+  await preserveSystemColorScheme(context)
   await setDeviceScaleFactorForMacOS(context)
 
   state.browser = browser
@@ -350,7 +374,9 @@ const server = new McpServer({
   version: '1.0.0',
 })
 
-const promptContent = fs.readFileSync(path.join(path.dirname(fileURLToPath(import.meta.url)), 'prompt.md'), 'utf-8') + `\n\nfor debugging errors, check relay server logs at: ${LOG_FILE_PATH}`
+const promptContent =
+  fs.readFileSync(path.join(path.dirname(fileURLToPath(import.meta.url)), 'prompt.md'), 'utf-8') +
+  `\n\nfor debugging internal playwriter errors, check playwriter relay server logs at: ${LOG_FILE_PATH}`
 
 server.tool(
   'execute',
@@ -597,7 +623,7 @@ server.tool(
           displayErrors: true,
         }),
         new Promise((_, reject) =>
-          setTimeout(() => reject(new Error(`Code execution timed out after ${timeout}ms`)), timeout),
+          setTimeout(() => reject(new CodeExecutionTimeoutError(timeout)), timeout),
         ),
       ])
 
@@ -636,7 +662,7 @@ server.tool(
 
       const logsText = formatConsoleLogs(consoleLogs, 'Console output (before error)')
 
-      const isTimeoutError = error.name === 'TimeoutError' || error.message.includes('Timeout')
+      const isTimeoutError = error instanceof CodeExecutionTimeoutError || error.name === 'TimeoutError'
       if (!isTimeoutError) {
         sendLogToRelayServer('error', '[MCP] Error:', errorStack)
       }
@@ -694,12 +720,13 @@ server.tool(
   },
 )
 
-// Start the server
 async function main() {
   await ensureRelayServer()
   const transport = new StdioServerTransport()
   await server.connect(transport)
-  // console.error('Playwright MCP server running on stdio')
 }
 
-main().catch(console.error)
+main().catch((error) => {
+  console.error('Fatal error starting MCP server:', error)
+  process.exit(1)
+})

package/src/prompt.md

@@ -51,9 +51,11 @@ IMPORTANT! never call bringToFront unless specifically asked by the user. It is
 
 - only call `page.close()` if the user asks you so or if you previously created this page yourself with `newPage`. do not close user created pages unless asked
 - try to never sleep or run `page.waitForTimeout` unless you have to. there are better ways to wait for an element
+- use `page.waitForLoadState('load')` instead of `page.waitForEvent('load')`. `waitForEvent` waits for a future event and will timeout if the page is already loaded, while `waitForLoadState` resolves immediately if already in that state
 - never close browser or context. NEVER call `browser.close()`
 - NEVER use `page.context().newCDPSession()` or `browser.newCDPSession()` - these do not work through the playwriter relay. If you need to send raw CDP commands, use the `getCDPSession` utility function instead.
 
+
 ## always check the current page state after an action
 
 after you click a button or submit a form you ALWAYS have to then check what is the current state of the page. you cannot assume what happened after doing an action. instead run the following code to know what happened after the action:

package/src/utils.ts

@@ -1,4 +1,5 @@
 import fs from 'node:fs'
+import os from 'node:os'
 import path from 'node:path'
 import { xdgData } from 'xdg-basedir'
 
@@ -8,7 +9,8 @@ export function getCdpUrl({ port = 19988, host = '127.0.0.1' }: { port?: number;
 }
 
 export function getDataDir(): string {
-  return path.join(xdgData!, 'playwriter')
+  const dataDir = xdgData || path.join(os.homedir(), '.local', 'share')
+  return path.join(dataDir, 'playwriter')
 }
 
 export function ensureDataDir(): string {

package/src/wait-for-page-load.ts

@@ -133,15 +133,26 @@ export async function waitForPageLoad(options: WaitForPageLoadOptions): Promise<
   await new Promise((resolve) => setTimeout(resolve, minWait))
 
   while (Date.now() - startTime < timeout) {
-    const { ready, readyState, pendingRequests } = await checkPageReady()
-    lastReadyState = readyState
-    lastPendingRequests = pendingRequests
+    try {
+      const { ready, readyState, pendingRequests } = await checkPageReady()
+      lastReadyState = readyState
+      lastPendingRequests = pendingRequests
 
-    if (ready) {
+      if (ready) {
+        return {
+          success: true,
+          readyState,
+          pendingRequests: [],
+          waitTimeMs: Date.now() - startTime,
+          timedOut: false,
+        }
+      }
+    } catch (e) {
+      console.error('[waitForPageLoad] page.evaluate failed:', e)
       return {
-        success: true,
-        readyState,
-        pendingRequests: [],
+        success: false,
+        readyState: 'error',
+        pendingRequests: ['page.evaluate failed - page may have closed or navigated'],
         waitTimeMs: Date.now() - startTime,
         timedOut: false,
       }