nolo-cli 0.148.0-alpha.1 → 0.151.0-alpha.2

package/chromeOpsCommands-3Z34RKSE.js

@@ -0,0 +1,472 @@
+import {
+  createChromeConnectorClient,
+  createVerifiedChromeConnectorClient
+} from "./chunk-BU2YQBV4.js";
+import "./chunk-KUG52IAP.js";
+import {
+  toErrorMessage
+} from "./chunk-HNMXYYJR.js";
+import {
+  readOption
+} from "./chunk-A7GB5UGH.js";
+import "./chunk-OLZBQWZU.js";
+import "./chunk-LCBAMY2M.js";
+import "./chunk-4SN6J65J.js";
+import "./chunk-CF7PE763.js";
+import "./chunk-G3SUCT4W.js";
+import "./chunk-4VNS5WPM.js";
+
+// packages/cli/chromeOpsCommands.ts
+import { writeFile } from "node:fs/promises";
+function wantsHelp(args) {
+  return args.includes("--help") || args.includes("-h");
+}
+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++) {
+    if (args[i] === flag && i + 1 < args.length) {
+      const val = args[i + 1].trim();
+      if (val && !val.startsWith("--")) {
+        values.push(val);
+      }
+    }
+  }
+  return values;
+}
+function readIntOption(args, flag, usage) {
+  const raw = readOption(args, flag);
+  if (raw === void 0) return void 0;
+  const value = Number.parseInt(raw, 10);
+  if (!Number.isFinite(value)) {
+    throw new Error(`Invalid ${flag} <N>. Usage: ${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) {
+    throw new Error(`Missing required --tab <id>. Usage: ${usage}`);
+  }
+  return tabId;
+}
+function requireTarget(args, usage) {
+  const elementRef = readTrimmedOption(args, "--ref");
+  const selector = readTrimmedOption(args, "--selector");
+  if (!elementRef && !selector) {
+    throw new Error(
+      `Provide --ref <elementRef> (from read-page) or --selector <css>. Usage: ${usage}`
+    );
+  }
+  return {
+    ...elementRef ? { elementRef } : {},
+    ...selector ? { selector } : {}
+  };
+}
+var CHROME_OPS_SUBCOMMANDS = {
+  "list-tabs": {
+    action: "list_tabs",
+    usage: "nolo browser list-tabs",
+    payload: () => ({})
+  },
+  "open-tab": {
+    action: "open_tab",
+    usage: "nolo browser open-tab --url <url> [--active]",
+    payload: (args, usage) => {
+      const url = readTrimmedOption(args, "--url");
+      if (!url) {
+        throw new Error(`Missing required --url <url>. Usage: ${usage}`);
+      }
+      return { url, active: args.includes("--active") };
+    }
+  },
+  "close-tab": {
+    action: "close_tab",
+    usage: "nolo browser close-tab --tab <id>",
+    payload: (args, usage) => ({ tabId: requireTabId(args, usage) })
+  },
+  "read-page": {
+    action: "read_page",
+    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");
+      if (selector) payload.selector = selector;
+      const detail = readTrimmedOption(args, "--detail");
+      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 browser click --tab <id> (--ref <elementRef> | --selector <css>)",
+    payload: (args, usage) => ({
+      tabId: requireTabId(args, usage),
+      ...requireTarget(args, usage)
+    })
+  },
+  type: {
+    action: "type",
+    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("--")) {
+        throw new Error(`Missing required --text <text>. Usage: ${usage}`);
+      }
+      return {
+        tabId: requireTabId(args, usage),
+        ...requireTarget(args, usage),
+        text,
+        ...args.includes("--append") ? { clearFirst: false } : {}
+      };
+    }
+  },
+  upload: {
+    action: "set_files",
+    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) {
+        throw new Error(`Missing required --file <path>. Usage: ${usage}`);
+      }
+      const target = requireTarget(args, usage);
+      const tabId = requireTabId(args, usage);
+      return {
+        tabId,
+        ...target,
+        ...target.elementRef ? { ref: target.elementRef } : {},
+        files
+      };
+    }
+  },
+  press: {
+    action: "press",
+    usage: "nolo browser press --tab <id> --key <key>",
+    payload: (args, usage) => {
+      const key = readTrimmedOption(args, "--key");
+      if (!key) {
+        throw new Error(`Missing required --key <key>. Usage: ${usage}`);
+      }
+      return { tabId: requireTabId(args, usage), key };
+    }
+  },
+  "prepare-action": {
+    action: "prepare_browser_action",
+    usage: "nolo browser prepare-action --tab <id> --action click|type|press (--selector <css> | --active) [--text <text>] [--key <key>] [--owner <id>] [--dialog <id>]",
+    payload: (args, usage) => {
+      const tabId = requireTabId(args, usage);
+      const action = readTrimmedOption(args, "--action").toLowerCase();
+      if (!action || !["click", "type", "press"].includes(action)) {
+        throw new Error(`Invalid or missing --action <click|type|press>. Usage: ${usage}`);
+      }
+      if (readOption(args, "--ref") !== void 0) {
+        throw new Error(`--ref is not supported for action preparation; use --selector or --active. Usage: ${usage}`);
+      }
+      const active = args.includes("--active");
+      const selector = readTrimmedOption(args, "--selector");
+      if (!active && !selector && action !== "press") {
+        throw new Error(`Provide --selector <css> or --active. Usage: ${usage}`);
+      }
+      const payload = {
+        tabId,
+        action,
+        ...active ? { active: true } : {},
+        ...selector ? { selector } : {}
+      };
+      if (action === "type") {
+        const text = readOption(args, "--text");
+        if (text === void 0 || text.startsWith("--")) {
+          throw new Error(`Missing required --text <text> for type action. Usage: ${usage}`);
+        }
+        payload.text = text;
+        if (args.includes("--append")) {
+          payload.clearFirst = false;
+        }
+      } else if (action === "press") {
+        const key = readTrimmedOption(args, "--key");
+        if (!key) {
+          throw new Error(`Missing required --key <key> for press action. Usage: ${usage}`);
+        }
+        payload.key = key;
+      }
+      const owner = readTrimmedOption(args, "--owner");
+      if (owner) payload.owner = owner;
+      const dialog = readTrimmedOption(args, "--dialog");
+      if (dialog) payload.dialogId = dialog;
+      return payload;
+    }
+  },
+  scroll: {
+    action: "scroll",
+    usage: "nolo browser scroll --tab <id> [--selector <css>] [--delta-x N] [--delta-y N]",
+    payload: (args, usage) => {
+      const payload = { tabId: requireTabId(args, usage) };
+      const selector = readTrimmedOption(args, "--selector");
+      const deltaX = readIntOption(args, "--delta-x", usage);
+      const deltaY = readIntOption(args, "--delta-y", usage);
+      if (selector) payload.selector = selector;
+      if (deltaX !== void 0) payload.deltaX = deltaX;
+      if (deltaY !== void 0) payload.deltaY = deltaY;
+      return payload;
+    }
+  },
+  screenshot: {
+    action: "screenshot",
+    usage: "nolo browser screenshot --tab <id> [--out <path>] [--full-page]",
+    payload: (args, usage) => ({
+      tabId: requireTabId(args, usage),
+      ...args.includes("--full-page") ? { fullPage: true } : {}
+    })
+  },
+  "read-console": {
+    action: "read_console",
+    usage: "nolo browser read-console --tab <id> [--limit N]",
+    payload: (args, usage) => {
+      const payload = { tabId: requireTabId(args, usage) };
+      const limit = readIntOption(args, "--limit", usage);
+      if (limit !== void 0) payload.limit = limit;
+      return payload;
+    }
+  },
+  "read-network": {
+    action: "read_network",
+    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);
+      if (limit !== void 0) payload.limit = limit;
+      if (args.includes("--include-assets")) payload.includeAssets = true;
+      return payload;
+    }
+  }
+};
+function renderChromeOpsHelp() {
+  const lines = [
+    "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 browser <subcommand> [flags]",
+    "  nolo chrome <subcommand> [flags]  # compatibility alias",
+    "",
+    "Subcommands:",
+    ...Object.values(CHROME_OPS_SUBCOMMANDS).map(
+      (spec) => `  ${spec.usage.replace(/^nolo browser /, "")}`
+    ),
+    "",
+    "Notes:",
+    "  --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.",
+    "  prepare-action prepares an immutable action challenge binding for host consent verification;",
+    "    it is strictly read-only, never executes mutations, and does not grant approval.",
+    "  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 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),
+    stderr: (text) => console.error(text),
+    ...deps.io
+  };
+  const spec = CHROME_OPS_SUBCOMMANDS[subcommand];
+  if (!spec) {
+    io.stderr(`Unknown browser subcommand "${subcommand}".
+
+${CHROME_OPS_HELP_TEXT}`);
+    return 1;
+  }
+  if (wantsHelp(args)) {
+    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);
+  } catch (error) {
+    io.stderr(toErrorMessage(error));
+    return 1;
+  }
+  let result;
+  try {
+    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";
+    io.stderr(JSON.stringify({ ok: false, error: { code, message: toErrorMessage(error) } }, null, 2));
+    return 1;
+  }
+  if (subcommand === "screenshot") {
+    const out = readTrimmedOption(args, "--out");
+    const dataUrl = result?.dataUrl;
+    if (out && typeof dataUrl === "string") {
+      const base64 = dataUrl.includes(",") ? dataUrl.slice(dataUrl.indexOf(",") + 1) : dataUrl;
+      const bytes = Buffer.from(base64, "base64");
+      try {
+        await writeFile(out, bytes);
+      } catch (error) {
+        io.stderr(
+          JSON.stringify(
+            {
+              ok: false,
+              error: { code: "SCREENSHOT_WRITE_FAILED", message: toErrorMessage(error) }
+            },
+            null,
+            2
+          )
+        );
+        return 1;
+      }
+      io.stdout(JSON.stringify({ ok: true, result: { savedTo: out, bytes: bytes.byteLength } }, null, 2));
+      return 0;
+    }
+  }
+  io.stdout(JSON.stringify({ ok: true, result }, null, 2));
+  return 0;
+}
+export {
+  CHROME_OPS_HELP_TEXT,
+  CHROME_OPS_SUBCOMMANDS,
+  renderChromeOpsHelp,
+  runChromeOpsCommand
+};

package/{chunk-ALXHV7NK.js → chunk-2GGXHQIW.js}

@@ -3,13 +3,45 @@ import {
 } from "./chunk-NF64D32W.js";
 import {
   CORE_DRAIN_REASON,
+  parsePositiveFiniteNumberOrFallback,
   parseRetryAfterHeaderMs
-} from "./chunk-3L2WKC3W.js";
+} from "./chunk-XPWGOTBQ.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";
 
 // packages/cli/connectorWebSocketTarget.ts
+var MAX_CONNECTOR_TIMER_DELAY_MS = 2147483647;
+function clampConnectorTimerDelayMs(value) {
+  return Math.min(Math.max(value, 1), MAX_CONNECTOR_TIMER_DELAY_MS);
+}
+var DEFAULT_CONNECTOR_PROBE_TIMEOUT_MS = 5e3;
+function resolveConnectorProbeTimeoutMs(env) {
+  return clampConnectorTimerDelayMs(
+    parsePositiveFiniteNumberOrFallback(
+      env.NOLO_CONNECT_PROBE_TIMEOUT_MS,
+      DEFAULT_CONNECTOR_PROBE_TIMEOUT_MS
+    )
+  );
+}
+async function probeConnectorWebSocketTarget(args) {
+  const controller = new AbortController();
+  let timer = null;
+  const timeoutPromise = new Promise((resolve) => {
+    timer = setTimeout(() => {
+      controller.abort();
+      resolve(null);
+    }, args.timeoutMs);
+  });
+  try {
+    return await Promise.race([
+      args.fetchImpl(args.probeUrl, { headers: args.headers, signal: controller.signal }).catch(() => null),
+      timeoutPromise
+    ]);
+  } finally {
+    if (timer) clearTimeout(timer);
+  }
+}
 var ConnectorWebSocketAuthError = class extends Error {
   code;
   constructor(message, code = "CONNECTOR_AUTH_FAILED") {
@@ -53,9 +85,13 @@ async function resolveConnectorWebSocketTarget(input) {
   const probeUrl = new URL(input.serverUrl);
   probeUrl.pathname = "/api/connector/ws";
   probeUrl.search = directWsUrl.search;
-  const response = await (input.fetchImpl ?? fetch)(probeUrl, {
-    headers: input.headers
-  }).catch(() => null);
+  const probeTimeoutMs = input.probeTimeoutMs ?? resolveConnectorProbeTimeoutMs(input.env ?? process.env);
+  const response = await probeConnectorWebSocketTarget({
+    fetchImpl: input.fetchImpl ?? fetch,
+    probeUrl,
+    headers: input.headers,
+    timeoutMs: clampConnectorTimerDelayMs(probeTimeoutMs)
+  });
   if (response && (response.status === 401 || response.status === 403)) {
     const json2 = await response.json().catch(() => null);
     const code = typeof json2?.code === "string" ? json2.code : "CONNECTOR_AUTH_FAILED";
@@ -82,6 +118,9 @@ async function resolveConnectorWebSocketTarget(input) {
 }
 
 export {
+  MAX_CONNECTOR_TIMER_DELAY_MS,
+  clampConnectorTimerDelayMs,
+  resolveConnectorProbeTimeoutMs,
   isConnectorWebSocketAuthError,
   isConnectorWebSocketRetryableError,
   resolveConnectorWebSocketTarget