@guanzhu.me/pw-cli 0.0.6 → 0.0.8

package/bin/pw-cli.js

@@ -716,6 +716,34 @@ async function main() {
     return;
   }
 
+  // ── From here on: delegate to playwright-cli (with enhancements) ─────────
+  const cliPath = findPlaywrightCli();
+  if (!cliPath) {
+    process.stderr.write('pw-cli: @playwright/cli not found.\nInstall: npm install -g @playwright/cli\n');
+    process.exit(1);
+  }
+
+  // Ensures a browser is reachable via CDP; if not, spawns playwright-cli open first.
+  async function ensureBrowserRunning() {
+    const { getPlaywrightCliCdpPort } = require('../src/browser-manager');
+    const { probeCDP } = require('../src/utils');
+    const { readState } = require('../src/state');
+    const cliPort = getPlaywrightCliCdpPort();
+    if (cliPort && await probeCDP(cliPort, 2000)) return;
+    const state = readState();
+    if (state && await probeCDP(state.port, 2000)) return;
+    // No browser reachable — start one via playwright-cli
+    const { spawnSync } = require('child_process');
+    const res = spawnSync(process.execPath, [cliPath, 'open', '--headed', '--persistent', '--profile', DEFAULT_PROFILE], {
+      stdio: 'inherit',
+      cwd: PW_CLI_DIR,
+    });
+    if (res.status !== 0) {
+      process.stderr.write('pw-cli: failed to open browser\n');
+      process.exit(res.status || 1);
+    }
+  }
+
   // ── goto: navigate the currently active tab (not always the first one) ───
   if (command === 'goto') {
     const gotoIdx = rawArgv.indexOf('goto');
@@ -725,25 +753,27 @@ async function main() {
       const fullUrl = /^https?:\/\//.test(rawUrl) ? rawUrl : `https://${rawUrl}`;
       const navCode = `async (page, context) => {
         const pages = context.pages();
-        let target = pages[pages.length - 1] || page;
-        for (const p of pages) {
-          try { if (!await p.evaluate(() => document.hidden)) { target = p; break; } } catch {}
-        }
+        const info = await Promise.all(pages.map(async p => {
+          try {
+            const [hidden, focused] = await Promise.all([
+              p.evaluate(() => document.hidden),
+              p.evaluate(() => document.hasFocus()),
+            ]);
+            return { p, hidden, focused };
+          } catch { return { p, hidden: true, focused: false }; }
+        }));
+        const focused = info.find(v => v.focused);
+        const visible = info.filter(v => !v.hidden);
+        const target = (focused || visible[visible.length - 1] || info[info.length - 1]).p;
         await target.goto(${JSON.stringify(fullUrl)}, { waitUntil: 'domcontentloaded', timeout: 0 });
         return target.url();
       }`;
+      await ensureBrowserRunning();
       await handleRunCode(['run-code', navCode]);
       return;
     }
   }
 
-  // ── From here on: delegate to playwright-cli (with enhancements) ─────────
-  const cliPath = findPlaywrightCli();
-  if (!cliPath) {
-    process.stderr.write('pw-cli: @playwright/cli not found.\nInstall: npm install -g @playwright/cli\n');
-    process.exit(1);
-  }
-
   let argv = [...rawArgv];
 
   // ── run-code: stdin support + auto-wrap plain code as function ───────────
@@ -781,13 +811,12 @@ async function main() {
     const openIdx = argv.indexOf('open');
     const afterOpen = argv.slice(openIdx + 1);
 
-    // If a URL is provided with open, always use our CDP executor directly.
-    // getConnection() handles all cases: reuse playwright-cli session, reuse own daemon,
-    // or start a new daemon — so we never need to spawn playwright-cli open separately.
+    // If a URL is provided with open, ensure a browser is running then open a new tab.
     const rawUrlArg = afterOpen.find(a => !a.startsWith('-') && /^(https?:\/\/|[a-zA-Z0-9]([a-zA-Z0-9-]*\.)+[a-zA-Z]{2,})/.test(a));
     const urlArg = rawUrlArg && !/^https?:\/\//.test(rawUrlArg) ? `https://${rawUrlArg}` : rawUrlArg;
     if (urlArg) {
       const navCode = `async page => { const newPage = await page.context().newPage(); await newPage.goto(${JSON.stringify(urlArg)}, { waitUntil: 'domcontentloaded', timeout: 0 }); return newPage.url(); }`;
+      await ensureBrowserRunning();
       await handleRunCode(['run-code', navCode]);
       return;
     } else {

package/package.json

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

@@ -175,4 +175,4 @@ async function killBrowser() {
   return true;
 }
 
-module.exports = { getConnection, killBrowser };
+module.exports = { getConnection, killBrowser, getPlaywrightCliCdpPort };