nolo-cli 0.107.0-alpha.4 → 0.107.1

package/{chromeOpsCommands-62P2Q2YB.js → chromeOpsCommands-ZYTCMNHG.js}

@@ -1,6 +1,7 @@
 import {
-  createChromeConnectorClient
-} from "./chunk-SH43IESU.js";
+  createChromeConnectorClient,
+  createVerifiedChromeConnectorClient
+} from "./chunk-GGC55Q32.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
@@ -23,6 +24,14 @@ function wantsHelp(args) {
 function readTrimmedOption(args, flag) {
   return (readOption(args, flag) ?? "").trim();
 }
+function readBrowserFlag(args) {
+  const equalsForm = args.find((arg) => arg.startsWith("--browser="));
+  const raw = equalsForm !== void 0 ? equalsForm.slice("--browser=".length) : readOption(args, "--browser");
+  if (raw === void 0) return void 0;
+  const value = raw.trim();
+  if (value === "chrome" || value === "firefox") return value;
+  return null;
+}
 function readAllOptions(args, flag) {
   const values = [];
   for (let i = 0; i < args.length; i++) {
@@ -44,6 +53,25 @@ function readIntOption(args, flag, usage) {
   }
   return value;
 }
+function readNonNegativeIntOption(args, flag, usage) {
+  const equalsForm = args.find((arg) => arg.startsWith(`${flag}=`));
+  const raw = equalsForm !== void 0 ? equalsForm.slice(`${flag}=`.length) : readOption(args, flag);
+  if (raw === void 0) {
+    if (args.includes(flag)) {
+      throw new Error(`Invalid ${flag} <N>. Usage: ${usage}`);
+    }
+    return void 0;
+  }
+  const trimmed = raw.trim();
+  if (!/^\d+$/.test(trimmed)) {
+    throw new Error(`Invalid ${flag} <N>. Usage: ${usage}`);
+  }
+  const value = Number.parseInt(trimmed, 10);
+  if (!Number.isFinite(value) || value < 0) {
+    throw new Error(`Invalid ${flag} <N>. Usage: ${usage}`);
+  }
+  return value;
+}
 function requireTabId(args, usage) {
   const tabId = readTrimmedOption(args, "--tab");
   if (!tabId) {
@@ -67,12 +95,12 @@ function requireTarget(args, usage) {
 var CHROME_OPS_SUBCOMMANDS = {
   "list-tabs": {
     action: "list_tabs",
-    usage: "nolo chrome list-tabs",
+    usage: "nolo browser list-tabs",
     payload: () => ({})
   },
   "open-tab": {
     action: "open_tab",
-    usage: "nolo chrome open-tab --url <url> [--active]",
+    usage: "nolo browser open-tab --url <url> [--active]",
     payload: (args, usage) => {
       const url = readTrimmedOption(args, "--url");
       if (!url) {
@@ -83,12 +111,12 @@ var CHROME_OPS_SUBCOMMANDS = {
   },
   "close-tab": {
     action: "close_tab",
-    usage: "nolo chrome close-tab --tab <id>",
+    usage: "nolo browser close-tab --tab <id>",
     payload: (args, usage) => ({ tabId: requireTabId(args, usage) })
   },
   "read-page": {
     action: "read_page",
-    usage: "nolo chrome read-page --tab <id> [--selector <css>] [--detail compact|full] [--max-elements N]",
+    usage: "nolo browser read-page --tab <id> [--selector <css>] [--detail compact|full] [--max-elements N] [--offset N] [--viewport]",
     payload: (args, usage) => {
       const payload = { tabId: requireTabId(args, usage) };
       const selector = readTrimmedOption(args, "--selector");
@@ -97,12 +125,15 @@ var CHROME_OPS_SUBCOMMANDS = {
       if (detail) payload.detail = detail;
       const maxElements = readIntOption(args, "--max-elements", usage);
       if (maxElements !== void 0) payload.maxElements = maxElements;
+      const offset = readNonNegativeIntOption(args, "--offset", usage);
+      if (offset !== void 0) payload.offset = offset;
+      if (args.includes("--viewport")) payload.viewportOnly = true;
       return payload;
     }
   },
   click: {
     action: "click",
-    usage: "nolo chrome click --tab <id> (--ref <elementRef> | --selector <css>)",
+    usage: "nolo browser click --tab <id> (--ref <elementRef> | --selector <css>)",
     payload: (args, usage) => ({
       tabId: requireTabId(args, usage),
       ...requireTarget(args, usage)
@@ -110,7 +141,7 @@ var CHROME_OPS_SUBCOMMANDS = {
   },
   type: {
     action: "type",
-    usage: "nolo chrome type --tab <id> (--ref <elementRef> | --selector <css>) --text <text> [--append]",
+    usage: "nolo browser type --tab <id> (--ref <elementRef> | --selector <css>) --text <text> [--append]",
     payload: (args, usage) => {
       const text = readOption(args, "--text");
       if (text === void 0 || text.startsWith("--")) {
@@ -126,7 +157,7 @@ var CHROME_OPS_SUBCOMMANDS = {
   },
   upload: {
     action: "set_files",
-    usage: "nolo chrome upload --tab <id> (--ref <elementRef> | --selector <css>) --file <path> [--file <path>...]",
+    usage: "nolo browser upload --tab <id> (--ref <elementRef> | --selector <css>) --file <path> [--file <path>...]",
     payload: (args, usage) => {
       const files = readAllOptions(args, "--file");
       if (files.length === 0) {
@@ -144,7 +175,7 @@ var CHROME_OPS_SUBCOMMANDS = {
   },
   press: {
     action: "press",
-    usage: "nolo chrome press --tab <id> --key <key>",
+    usage: "nolo browser press --tab <id> --key <key>",
     payload: (args, usage) => {
       const key = readTrimmedOption(args, "--key");
       if (!key) {
@@ -155,7 +186,7 @@ var CHROME_OPS_SUBCOMMANDS = {
   },
   scroll: {
     action: "scroll",
-    usage: "nolo chrome scroll --tab <id> [--delta-x N] [--delta-y N]",
+    usage: "nolo browser scroll --tab <id> [--delta-x N] [--delta-y N]",
     payload: (args, usage) => {
       const payload = { tabId: requireTabId(args, usage) };
       const deltaX = readIntOption(args, "--delta-x", usage);
@@ -167,7 +198,7 @@ var CHROME_OPS_SUBCOMMANDS = {
   },
   screenshot: {
     action: "screenshot",
-    usage: "nolo chrome screenshot --tab <id> [--out <path>] [--full-page]",
+    usage: "nolo browser screenshot --tab <id> [--out <path>] [--full-page]",
     payload: (args, usage) => ({
       tabId: requireTabId(args, usage),
       ...args.includes("--full-page") ? { fullPage: true } : {}
@@ -175,7 +206,7 @@ var CHROME_OPS_SUBCOMMANDS = {
   },
   "read-console": {
     action: "read_console",
-    usage: "nolo chrome read-console --tab <id> [--limit N]",
+    usage: "nolo browser read-console --tab <id> [--limit N]",
     payload: (args, usage) => {
       const payload = { tabId: requireTabId(args, usage) };
       const limit = readIntOption(args, "--limit", usage);
@@ -185,7 +216,7 @@ var CHROME_OPS_SUBCOMMANDS = {
   },
   "read-network": {
     action: "read_network",
-    usage: "nolo chrome read-network --tab <id> [--limit N] [--include-assets]",
+    usage: "nolo browser read-network --tab <id> [--limit N] [--include-assets]",
     payload: (args, usage) => {
       const payload = { tabId: requireTabId(args, usage) };
       const limit = readIntOption(args, "--limit", usage);
@@ -197,28 +228,59 @@ var CHROME_OPS_SUBCOMMANDS = {
 };
 function renderChromeOpsHelp() {
   const lines = [
-    "Operate the user's Chrome through the Nolo Chrome connector (the desktop bridge;",
-    "the same RPC the chrome_* agent tools use).",
+    "Operate the user's browser (Chrome or Firefox) through the Nolo Browser Connector",
+    "(the desktop bridge; the same RPC the browser_* agent tools use \u2014 legacy `chrome_*` names still work).",
     "",
     "Usage:",
-    "  nolo chrome <subcommand> [flags]",
+    "  nolo browser <subcommand> [flags]",
+    "  nolo chrome <subcommand> [flags]  # compatibility alias",
     "",
     "Subcommands:",
     ...Object.values(CHROME_OPS_SUBCOMMANDS).map(
-      (spec) => `  ${spec.usage.replace(/^nolo chrome /, "")}`
+      (spec) => `  ${spec.usage.replace(/^nolo browser /, "")}`
     ),
     "",
     "Notes:",
-    "  --ref takes an elementRef copied from `nolo chrome read-page` (revision-scoped,",
+    "  --ref takes an elementRef copied from `nolo browser read-page` (revision-scoped,",
     "    preferred over --selector); --selector takes a CSS selector.",
     "  Actions the connector classifies as irreversible (Submit / Delete / Pay ...)",
     "    are refused with CONFIRMATION_REQUIRED \u2014 ask the user to perform them.",
+    "  read-console / read-network / upload work on Chrome only (Firefox lacks chrome.debugger).",
+    "  --browser chrome|firefox selects which connector endpoint serves the call (default",
+    "    auto-detects single online browser: chrome = 127.0.0.1:38947, firefox = 127.0.0.1:38948);",
+    "    the wrong browser is refused.",
     "  Every subcommand prints the connector's raw JSON result; failures exit 1.",
-    "  Endpoint: NOLO_CHROME_CONNECTOR_RPC_URL or http://127.0.0.1:38947/rpc."
+    "  Endpoint: NOLO_CHROME_CONNECTOR_RPC_URL or per-browser NOLO_CHROME_CONNECTOR_PORT /",
+    "    NOLO_FIREFOX_CONNECTOR_PORT (default http://127.0.0.1:38947/rpc)."
   ];
   return lines.join("\n");
 }
 var CHROME_OPS_HELP_TEXT = renderChromeOpsHelp();
+async function defaultProbeBrowser(browser) {
+  try {
+    const client = createChromeConnectorClient({
+      browser,
+      fetchImpl: (input, init) => {
+        return fetch(input, {
+          ...init,
+          signal: AbortSignal.timeout(400)
+        });
+      }
+    });
+    const info = await client.request("connector_info", {});
+    return typeof info?.extensionId === "string";
+  } catch (error) {
+    if (error?.code === "CHROME_CONNECTOR_UNAVAILABLE") {
+      return false;
+    }
+    const handshakeError = new Error(
+      `\u63A2\u6D4B\u5230\u7AEF\u70B9\u4F46\u63E1\u624B\u5931\u8D25\uFF1A${toErrorMessage(error)}`
+    );
+    handshakeError.code = error?.code || "CHROME_CONNECTOR_HANDSHAKE_FAILED";
+    handshakeError.details = error?.details;
+    throw handshakeError;
+  }
+}
 async function runChromeOpsCommand(subcommand, args, deps = {}) {
   const io = {
     stdout: (text) => console.log(text),
@@ -227,7 +289,7 @@ async function runChromeOpsCommand(subcommand, args, deps = {}) {
   };
   const spec = CHROME_OPS_SUBCOMMANDS[subcommand];
   if (!spec) {
-    io.stderr(`Unknown chrome subcommand: ${subcommand}
+    io.stderr(`Unknown browser subcommand "${subcommand}".
 
 ${CHROME_OPS_HELP_TEXT}`);
     return 1;
@@ -236,6 +298,13 @@ ${CHROME_OPS_HELP_TEXT}`);
     io.stdout(CHROME_OPS_HELP_TEXT);
     return 0;
   }
+  const browserFlag = readBrowserFlag(args);
+  if (browserFlag === null) {
+    io.stderr(
+      `Invalid --browser value: expected "chrome" or "firefox". Usage: ${spec.usage}`
+    );
+    return 1;
+  }
   let payload;
   try {
     payload = spec.payload(args, spec.usage);
@@ -245,7 +314,72 @@ ${CHROME_OPS_HELP_TEXT}`);
   }
   let result;
   try {
-    const client = deps.client ?? createChromeConnectorClient();
+    const env = deps.env ?? process.env;
+    let client;
+    if (deps.client) {
+      client = deps.client;
+    } else {
+      let targetBrowser = browserFlag;
+      if (!targetBrowser && !env.NOLO_CHROME_CONNECTOR_RPC_URL) {
+        const probe = deps.probeBrowser ?? defaultProbeBrowser;
+        const [chromeResult, firefoxResult] = await Promise.allSettled([
+          probe("chrome"),
+          probe("firefox")
+        ]);
+        const chromeOnline = chromeResult.status === "fulfilled" && chromeResult.value === true;
+        const firefoxOnline = firefoxResult.status === "fulfilled" && firefoxResult.value === true;
+        if (chromeOnline && firefoxOnline) {
+          const error = new Error(
+            "Both Chrome and Firefox connectors are online. Specify --browser chrome or --browser firefox."
+          );
+          error.code = "MULTIPLE_BROWSERS_AVAILABLE";
+          throw error;
+        }
+        if (chromeOnline) {
+          targetBrowser = "chrome";
+        } else if (firefoxOnline) {
+          targetBrowser = "firefox";
+        } else {
+          if (chromeResult.status === "rejected") {
+            const reason = toErrorMessage(chromeResult.reason);
+            const err = new Error(
+              reason.startsWith("\u63A2\u6D4B\u5230\u7AEF\u70B9\u4F46\u63E1\u624B\u5931\u8D25\uFF1A") ? reason : `\u63A2\u6D4B\u5230\u7AEF\u70B9\u4F46\u63E1\u624B\u5931\u8D25\uFF1A${reason}`
+            );
+            err.code = chromeResult.reason?.code || "CHROME_CONNECTOR_HANDSHAKE_FAILED";
+            err.details = chromeResult.reason?.details;
+            throw err;
+          }
+          if (firefoxResult.status === "rejected") {
+            const reason = toErrorMessage(firefoxResult.reason);
+            const err = new Error(
+              reason.startsWith("\u63A2\u6D4B\u5230\u7AEF\u70B9\u4F46\u63E1\u624B\u5931\u8D25\uFF1A") ? reason : `\u63A2\u6D4B\u5230\u7AEF\u70B9\u4F46\u63E1\u624B\u5931\u8D25\uFF1A${reason}`
+            );
+            err.code = firefoxResult.reason?.code || "CHROME_CONNECTOR_HANDSHAKE_FAILED";
+            err.details = firefoxResult.reason?.details;
+            throw err;
+          }
+          const chromePort = env.NOLO_CHROME_CONNECTOR_PORT || 38947;
+          const firefoxPort = env.NOLO_FIREFOX_CONNECTOR_PORT || 38948;
+          const chromeEndpoint = `http://127.0.0.1:${chromePort}/rpc`;
+          const firefoxEndpoint = `http://127.0.0.1:${firefoxPort}/rpc`;
+          const error = new Error(
+            `Chrome connector RPC endpoint is unavailable at ${chromeEndpoint} or ${firefoxEndpoint}.`
+          );
+          error.code = "CHROME_CONNECTOR_UNAVAILABLE";
+          throw error;
+        }
+      }
+      if (deps.createClient) {
+        client = deps.createClient(targetBrowser);
+      } else if (targetBrowser) {
+        client = createVerifiedChromeConnectorClient({
+          client: createChromeConnectorClient({ browser: targetBrowser }),
+          expectedBrowser: targetBrowser
+        });
+      } else {
+        client = createChromeConnectorClient();
+      }
+    }
     result = await client.request(spec.action, payload);
   } catch (error) {
     const code = typeof error?.code === "string" ? error.code : "CHROME_COMMAND_FAILED";