@guanzhu.me/pw-cli 0.0.8 → 0.0.10

package/bin/pw-cli.js

@@ -724,14 +724,15 @@ async function main() {
   }
 
   // Ensures a browser is reachable via CDP; if not, spawns playwright-cli open first.
+  // Returns the CDP port number.
   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;
+    if (cliPort && await probeCDP(cliPort, 2000)) return cliPort;
     const state = readState();
-    if (state && await probeCDP(state.port, 2000)) return;
+    if (state && await probeCDP(state.port, 2000)) return state.port;
     // 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], {
@@ -742,33 +743,31 @@ async function main() {
       process.stderr.write('pw-cli: failed to open browser\n');
       process.exit(res.status || 1);
     }
+    // After spawning, re-detect the port
+    const newCliPort = getPlaywrightCliCdpPort();
+    if (newCliPort) return newCliPort;
+    const newState = readState();
+    return newState ? newState.port : null;
   }
 
-  // ── goto: navigate the currently active tab (not always the first one) ───
+  // ── goto: navigate the active tab (detected via CDP /json/list) ──────────
   if (command === 'goto') {
     const gotoIdx = rawArgv.indexOf('goto');
     const afterGoto = rawArgv.slice(gotoIdx + 1);
     const rawUrl = afterGoto.find(a => !a.startsWith('-'));
     if (rawUrl) {
       const fullUrl = /^https?:\/\//.test(rawUrl) ? rawUrl : `https://${rawUrl}`;
+      const cdpPort = await ensureBrowserRunning();
+      const { fetchActivePageUrl } = require('../src/utils');
+      const activeUrl = await fetchActivePageUrl(cdpPort);
       const navCode = `async (page, context) => {
         const pages = context.pages();
-        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;
+        let target = pages[pages.length - 1] || page;
+        ${activeUrl ? `const match = pages.find(p => p.url() === ${JSON.stringify(activeUrl)});
+        if (match) target = match;` : ''}
         await target.goto(${JSON.stringify(fullUrl)}, { waitUntil: 'domcontentloaded', timeout: 0 });
         return target.url();
       }`;
-      await ensureBrowserRunning();
       await handleRunCode(['run-code', navCode]);
       return;
     }
@@ -815,7 +814,11 @@ async function main() {
     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(); }`;
+      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;

package/package.json

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

package/src/utils.js

@@ -52,4 +52,27 @@ function sleep(ms) {
   return new Promise(r => setTimeout(r, ms));
 }
 
-module.exports = { readStdin, die, probeCDP, findFreePort, sleep };
+/**
+ * Fetch the URL of the most recently active page tab via Chrome's /json/list endpoint.
+ * Chrome returns targets ordered by most-recently-activated first.
+ * Returns the URL string, or null if no page target found.
+ */
+function fetchActivePageUrl(port) {
+  return new Promise(resolve => {
+    const req = http.get(`http://127.0.0.1:${port}/json/list`, { timeout: 3000 }, res => {
+      let data = '';
+      res.on('data', chunk => { data += chunk; });
+      res.on('end', () => {
+        try {
+          const targets = JSON.parse(data);
+          const page = targets.find(t => t.type === 'page');
+          resolve(page ? page.url : null);
+        } catch { resolve(null); }
+      });
+    });
+    req.on('error', () => resolve(null));
+    req.on('timeout', () => { req.destroy(); resolve(null); });
+  });
+}
+
+module.exports = { readStdin, die, probeCDP, findFreePort, sleep, fetchActivePageUrl };