@guanzhu.me/pw-cli 0.0.20 → 0.0.22

package/bin/pw-cli.js

@@ -718,9 +718,17 @@ async function handleRunScript(rawArgv) {
       break;
     }
   }
-  // Merge any flags after run-script into options
-  const afterOptions = parsePwCliGlobalOptions(flags);
-  Object.assign(options, afterOptions);
+  // Merge only explicitly specified flags after run-script into options
+  // (avoid overwriting earlier options with defaults from parsePwCliGlobalOptions)
+  if (flags.length > 0) {
+    const defaults = parsePwCliGlobalOptions([]);
+    const afterOptions = parsePwCliGlobalOptions(flags);
+    for (const [key, value] of Object.entries(afterOptions)) {
+      if (value !== defaults[key]) {
+        options[key] = value;
+      }
+    }
+  }
 
   const positionals = afterRs.slice(restIdx);
   const [scriptPath, ...scriptArgs] = positionals;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@guanzhu.me/pw-cli",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "description": "Persistent Playwright browser CLI with headed defaults, profile support, queueing, and script execution",
   "bin": {
     "pw-cli": "./bin/pw-cli.js"

package/src/browser-manager.js

@@ -11,22 +11,34 @@ const { readState, writeState, clearState, getProfileDir } = require('./state');
 const { probeCDP, findFreePort, sleep, fetchActivePageUrl } = require('./utils');
 
 function loadPlaywrightUtilsBundle() {
-  const candidates = [
-    '../node_modules/@playwright/cli/node_modules/playwright-core/lib/utilsBundleImpl',
-    '../node_modules/@playwright/cli/node_modules/playwright-core/lib/utilsBundleImpl/index.js',
+  // playwright-core's package.json "exports" blocks deep subpath requires, so
+  // we locate the package root via require.resolve on package.json, then load
+  // the internal module by absolute path.
+  const searchPaths = [
+    path.join(__dirname, '..'),                           // local dev
+    path.join(__dirname, '..', 'node_modules', '@playwright', 'cli'),  // nested under pw-cli
   ];
 
-  for (const candidate of candidates) {
+  // Also search from the global npm root where @playwright/cli might live
+  try {
+    const globalRoot = execSync('npm root -g', { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }).trim();
+    searchPaths.push(path.join(globalRoot, '@playwright', 'cli'));
+    searchPaths.push(globalRoot);
+  } catch {}
+
+  for (const searchPath of searchPaths) {
     try {
-      return require(candidate);
+      const pkgJson = require.resolve('playwright-core/package.json', { paths: [searchPath] });
+      const utilsBundle = path.join(path.dirname(pkgJson), 'lib', 'utilsBundleImpl');
+      return require(utilsBundle);
     } catch (error) {
-      if (error.code !== 'MODULE_NOT_FOUND') {
+      if (error.code !== 'MODULE_NOT_FOUND' && error.code !== 'ERR_PACKAGE_PATH_NOT_EXPORTED') {
         throw error;
       }
     }
   }
 
-  throw new Error('Unable to load playwright-core utilsBundleImpl from @playwright/cli. Reinstall @playwright/cli or playwright.');
+  throw new Error('Unable to load playwright-core utilsBundleImpl. Reinstall @playwright/cli or playwright.');
 }
 
 const { ws, wsServer } = loadPlaywrightUtilsBundle();
@@ -310,11 +322,14 @@ class CDPRelayServer {
   }
 
   _connectBrowser(clientName) {
-    const relayUrl = `${this._wsHost}${this._extensionPath}`;
-    const url = new URL('chrome-extension://mmlmfjhmonkocbjadbfplnigmagldckm/connect.html');
-    url.searchParams.set('mcpRelayUrl', relayUrl);
+    const mcpRelayEndpoint = `${this._wsHost}${this._extensionPath}`;
+    // Support both the new official extension ID and the legacy one
+    const extensionId = process.env.PLAYWRIGHT_MCP_EXTENSION_ID || 'mmlmfjhmonkocbjadbfplnigmagldckm';
+    const url = new URL(`chrome-extension://${extensionId}/connect.html`);
+    url.searchParams.set('mcpRelayUrl', mcpRelayEndpoint);
     url.searchParams.set('client', JSON.stringify({ name: clientName }));
     url.searchParams.set('protocolVersion', '1');
+    url.searchParams.set('newTab', 'true');
     if (this._extensionToken) {
       url.searchParams.set('token', this._extensionToken);
     }
@@ -342,13 +357,6 @@ class CDPRelayServer {
       return;
     }
     if (url.pathname === this._extensionPath) {
-      if (this._extensionToken) {
-        const token = url.searchParams.get('token');
-        if (token !== this._extensionToken) {
-          socket.close(4003, 'Invalid token');
-          return;
-        }
-      }
       this._handleExtensionConnection(socket);
       return;
     }