@guanzhu.me/pw-cli 0.0.13 → 0.0.14

package/package.json

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

@@ -7,7 +7,7 @@ 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');
 
@@ -61,6 +61,32 @@ function loadPlaywright() {
   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)
 // ---------------------------------------------------------------------------
@@ -131,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
@@ -163,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 };
 }
@@ -188,4 +208,4 @@ async function killBrowser() {
   return true;
 }
 
-module.exports = { getConnection, killBrowser, getPlaywrightCliCdpPort };
+module.exports = { getConnection, killBrowser, getPlaywrightCliCdpPort, pickPage };