@guanzhu.me/pw-cli 0.0.12 → 0.0.14

package/bin/pw-cli.js

@@ -291,6 +291,20 @@ run-script example:
 `.trim() + '\n');
 }
 
+function getRunScriptHelpText() {
+  return `Usage:
+  pw-cli run-script <file.js> [args...]
+
+What the script receives:
+  - Playwright globals: page, context, browser, playwright
+  - Script args array: args
+  - CommonJS globals: require, module, exports, __filename, __dirname
+
+Example:
+  pw-cli run-script ./scripts/extract-links.js --url https://example.com --output links.json
+`;
+}
+
 // Management commands that don't need a running browser
 const MGMT_COMMANDS = new Set([
   'open', 'close', 'list', 'kill-all', 'close-all', 'delete-data',
@@ -644,19 +658,7 @@ async function handleRunScript(rawArgv) {
   const [scriptPath, ...scriptArgs] = positionals;
 
   if (!scriptPath) {
-    process.stderr.write(`pw-cli: run-script requires a script path
-
-Usage:
-  pw-cli run-script <file.js> [args...]
-
-What the script receives:
-  - Playwright globals: page, context, browser, playwright
-  - Script args array: args
-  - CommonJS globals: require, module, exports, __filename, __dirname
-
-Example:
-  pw-cli run-script ./scripts/extract-links.js --url https://example.com --output links.json
-`);
+    process.stderr.write(`pw-cli: run-script requires a script path\n\n${getRunScriptHelpText()}`);
     process.exit(1);
   }
   if (!fs.existsSync(path.resolve(scriptPath))) {
@@ -744,6 +746,13 @@ async function main() {
     return;
   }
 
+  if (command === 'run-scirpt') {
+    process.stderr.write('pw-cli: unknown command: run-scirpt\n');
+    process.stderr.write('Did you mean: run-script?\n\n');
+    process.stdout.write(getRunScriptHelpText());
+    process.exit(1);
+  }
+
   // ── queue: batch actions and run them together ────────────────────────────
   if (command === 'queue') {
     await handleQueue(rawArgv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@guanzhu.me/pw-cli",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "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

@@ -5,8 +5,9 @@ const path = require('path');
 const os = require('os');
 const fs = require('fs');
 const crypto = require('crypto');
+const { execSync } = require('child_process');
 const { readState, writeState, clearState, getProfileDir } = require('./state');
-const { probeCDP, findFreePort, sleep } = require('./utils');
+const { probeCDP, findFreePort, sleep, fetchActivePageUrl } = require('./utils');
 
 const DAEMON_SCRIPT = path.join(__dirname, 'launch-daemon.js');
 
@@ -43,6 +44,49 @@ function getPlaywrightCliCdpPort(sessionName = 'default') {
   return session?.resolvedConfig?.browser?.launchOptions?.cdpPort || null;
 }
 
+function loadPlaywright() {
+  try {
+    return require('playwright');
+  } catch {}
+
+  try {
+    const globalRoot = execSync('npm root -g', {
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'ignore'],
+    }).trim();
+    const cliPlaywrightPath = path.join(globalRoot, '@playwright', 'cli', 'node_modules', 'playwright');
+    return require(cliPlaywrightPath);
+  } catch {}
+
+  throw new Error('playwright is not installed. Run: npm install -g playwright');
+}
+
+function pickPage(pages, activeUrl) {
+  if (!pages || pages.length === 0) return null;
+  if (activeUrl) {
+    const matchingPages = pages.filter(page => {
+      try {
+        return page.url() === activeUrl;
+      } catch {
+        return false;
+      }
+    });
+    if (matchingPages.length > 0) {
+      return matchingPages[matchingPages.length - 1];
+    }
+  }
+  return pages[pages.length - 1];
+}
+
+async function resolveContextAndPage(browser, cdpPort) {
+  const contexts = browser.contexts();
+  const context = contexts.length > 0 ? contexts[0] : await browser.newContext();
+  const pages = context.pages();
+  const activeUrl = cdpPort ? await fetchActivePageUrl(cdpPort) : null;
+  const page = pickPage(pages, activeUrl) || await context.newPage();
+  return { context, page };
+}
+
 // ---------------------------------------------------------------------------
 // Our own CDP-based browser launcher (fallback when playwright-cli not running)
 // ---------------------------------------------------------------------------
@@ -104,12 +148,7 @@ async function launchBrowser({ headless = false, profile = 'default', port: pref
 // getConnection — tries playwright-cli browser first, then our own
 // ---------------------------------------------------------------------------
 async function getConnection({ headless = false, profile = 'default', port: preferredPort = 9223 } = {}) {
-  let playwright;
-  try {
-    playwright = require('playwright');
-  } catch {
-    throw new Error('playwright is not installed. Run: npm install -g playwright');
-  }
+  const playwright = loadPlaywright();
 
   // 1. Try to reuse playwright-cli's browser via its CDP port
   const cliCdpPort = getPlaywrightCliCdpPort();
@@ -118,10 +157,7 @@ async function getConnection({ headless = false, profile = 'default', port: pref
     if (alive) {
       try {
         const browser = await playwright.chromium.connectOverCDP(`http://127.0.0.1:${cliCdpPort}`);
-        const contexts = browser.contexts();
-        const context = contexts.length > 0 ? contexts[0] : await browser.newContext();
-        const pages = context.pages();
-        const page = pages.length > 0 ? pages[0] : await context.newPage();
+        const { context, page } = await resolveContextAndPage(browser, cliCdpPort);
         return { browser, context, page, playwright };
       } catch {
         // fall through to own browser
@@ -150,10 +186,7 @@ async function getConnection({ headless = false, profile = 'default', port: pref
   }
 
   const browser = await playwright.chromium.connectOverCDP(cdpUrl);
-  const contexts = browser.contexts();
-  const context = contexts.length > 0 ? contexts[0] : await browser.newContext();
-  const pages = context.pages();
-  const page = pages.length > 0 ? pages[0] : await context.newPage();
+  const { context, page } = await resolveContextAndPage(browser, state ? state.port : null);
 
   return { browser, context, page, playwright };
 }
@@ -175,4 +208,4 @@ async function killBrowser() {
   return true;
 }
 
-module.exports = { getConnection, killBrowser, getPlaywrightCliCdpPort };
+module.exports = { getConnection, killBrowser, getPlaywrightCliCdpPort, pickPage };

package/src/cli.js

@@ -51,12 +51,8 @@ async function cmdRunCode(rest, opts) {
   }
 }
 
-async function cmdRunScript(rest, opts) {
-  const [scriptPath, ...scriptArgs] = rest;
-  if (!scriptPath) {
-    die(`No script path provided.
-
-Usage:
+function getRunScriptHelp() {
+  return `Usage:
   pw-cli run-script <file.js> [args...]
 
 What the script receives:
@@ -65,7 +61,13 @@ What the script receives:
   - CommonJS globals: require, module, exports, __filename, __dirname
 
 Example:
-  pw-cli run-script ./scripts/extract-links.js --url https://example.com --output links.json`);
+  pw-cli run-script ./scripts/extract-links.js --url https://example.com --output links.json`;
+}
+
+async function cmdRunScript(rest, opts) {
+  const [scriptPath, ...scriptArgs] = rest;
+  if (!scriptPath) {
+    die(`No script path provided.\n\n${getRunScriptHelp()}`);
   }
 
   const conn = await getConnection(opts);
@@ -156,6 +158,13 @@ async function run(argv) {
     return;
   }
 
+  if (command === 'run-scirpt') {
+    console.error('Unknown command: run-scirpt');
+    console.error('Did you mean: run-script?\n');
+    console.log(getRunScriptHelp());
+    process.exit(1);
+  }
+
   try {
     switch (command) {
       case 'run-code':

package/src/launch-daemon.js

@@ -6,6 +6,8 @@
 // Args: --profile-dir <dir> --port <port> [--headless]
 
 const args = process.argv.slice(2);
+const path = require('path');
+const { execSync } = require('child_process');
 
 function getArg(name) {
   const i = args.indexOf(name);
@@ -16,22 +18,48 @@ const profileDir = getArg('--profile-dir');
 const port = parseInt(getArg('--port') || '9222', 10);
 const headless = args.includes('--headless');
 
+function loadPlaywright() {
+  try {
+    return require('playwright');
+  } catch {}
+
+  try {
+    const globalRoot = execSync('npm root -g', {
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'ignore'],
+    }).trim();
+    const cliPlaywrightPath = path.join(globalRoot, '@playwright', 'cli', 'node_modules', 'playwright');
+    return require(cliPlaywrightPath);
+  } catch {}
+
+  throw new Error('playwright not found - run: npm install -g playwright');
+}
+
+function formatLaunchError(error) {
+  const message = error && error.message ? error.message : String(error);
+  if (message.includes("Executable doesn't exist")) {
+    return [
+      'Playwright browser executable is not installed for the selected engine.',
+      'pw-cli now prefers your local Chrome install for fallback launches.',
+      'Run one of the following commands first:',
+      '  pw-cli open',
+      '  pw-cli install-browser',
+      '  npx playwright install chromium',
+    ].join('\n');
+  }
+  return message;
+}
+
 if (!profileDir) {
   process.stderr.write('ERROR:missing --profile-dir\n');
   process.exit(1);
 }
 
 (async () => {
-  let playwright;
-  try {
-    playwright = require('playwright');
-  } catch (e) {
-    process.stdout.write(`ERROR:playwright not found - run: npm install -g playwright\n`);
-    process.exit(1);
-  }
-
   try {
+    const playwright = loadPlaywright();
     const context = await playwright.chromium.launchPersistentContext(profileDir, {
+      channel: 'chrome',
       headless,
       args: [`--remote-debugging-port=${port}`],
       ignoreDefaultArgs: ['--enable-automation'],
@@ -59,7 +87,7 @@ if (!profileDir) {
     // Prevent premature exit
     process.stdin.resume();
   } catch (e) {
-    process.stdout.write(`ERROR:${e.message}\n`);
+    process.stdout.write(`ERROR:${formatLaunchError(e)}\n`);
     process.exit(1);
   }
 })();