@xbrowser/cli 1.24.3 → 1.25.1

package/dist/{chunk-BH3GIMWE.js → chunk-ZGHLHBXX.js}

@@ -9,7 +9,7 @@ import {
   landingOffset,
   rand,
   typingDelay
-} from "./chunk-GYB5BOSP.js";
+} from "./chunk-R3F4K2SB.js";
 import {
   connectToCDP,
   launchChrome
@@ -4852,7 +4852,7 @@ async function launch(options = {}) {
     const bv = await conn.send("Browser.getVersion");
     const m = bv.product.match(/(\d+)\.(\d+)\.(\d+)\.(\d+)/);
     if (m && !options.stealthConfig?.uaChProfile) {
-      const { deriveUaChProfileForBinary } = await import("./stealth-JOXGV34D.js");
+      const { deriveUaChProfileForBinary } = await import("./stealth-MHJNBJY7.js");
       stealthOpts = { stealthConfig: { uaChProfile: deriveUaChProfileForBinary(m[0], m[1]) } };
     }
   } catch {

package/dist/cli.js

@@ -10,13 +10,14 @@ import {
   executeCommand,
   getAllCommands,
   getCommand,
+  getCommandNames,
   getPluginLoader,
   getPluginStorage,
   isChainInput,
   loadHooks,
   parsePluginParams,
   readJsonFile
-} from "./chunk-SUHS2EWV.js";
+} from "./chunk-55TCNPMB.js";
 import "./chunk-JKVUFP3G.js";
 import {
   forwardCommandLog,
@@ -80,8 +81,8 @@ import {
   findSession,
   getAllSessions,
   saveSessionDiskMeta
-} from "./chunk-X735U7G7.js";
-import "./chunk-GYB5BOSP.js";
+} from "./chunk-CRRR4KUO.js";
+import "./chunk-R3F4K2SB.js";
 import "./chunk-MYH6FIBZ.js";
 import {
   errMsg
@@ -2508,10 +2509,11 @@ async function handleBrowserCommand(command, args, options, sessionName, mode, c
       }
       case "mouse": {
         const flatArgs = args.flatMap((a) => a.split(/\s+/).filter(Boolean));
-        const action = options.action || flatArgs.find((a) => ["move", "click", "dblclick", "down", "up"].includes(a));
-        const actionIdx = action ? flatArgs.indexOf(action) : -1;
-        const x = options.x !== void 0 ? Number(options.x) : actionIdx >= 0 && flatArgs[actionIdx + 1] ? Number(flatArgs[actionIdx + 1]) : void 0;
-        const y = options.y !== void 0 ? Number(options.y) : actionIdx >= 0 && flatArgs[actionIdx + 2] ? Number(flatArgs[actionIdx + 2]) : void 0;
+        const argActionIdx = flatArgs.findIndex((a) => ["move", "click", "dblclick", "down", "up"].includes(a));
+        const action = options.action || (argActionIdx >= 0 ? flatArgs[argActionIdx] : void 0);
+        const coordArgs = options.action !== void 0 ? flatArgs : argActionIdx >= 0 ? flatArgs.slice(argActionIdx + 1) : flatArgs;
+        const x = options.x !== void 0 ? Number(options.x) : coordArgs[0] !== void 0 ? Number(coordArgs[0]) : void 0;
+        const y = options.y !== void 0 ? Number(options.y) : coordArgs[1] !== void 0 ? Number(coordArgs[1]) : void 0;
         if (!action || x === void 0 || y === void 0 || isNaN(x) || isNaN(y)) {
           outputError("Usage: xbrowser mouse <move|click|dblclick> <x> <y>\n       xbrowser mouse --action <action> --x <x> --y <y>");
         }
@@ -5466,7 +5468,13 @@ function extractSessionNameFromArgv(argv) {
 async function handleEvalMode(argv) {
   const evalCommands = parseEvalFlags(argv);
   if (evalCommands.length === 0) return;
-  const chain = evalCommands.map((script) => `eval --script-b64 ${Buffer.from(script, "utf8").toString("base64url")}`).join(" ; ");
+  const knownCommands = new Set(getCommandNames());
+  const chainParts = evalCommands.map((value) => {
+    const firstWord = value.trim().split(/\s+/)[0] || "";
+    if (knownCommands.has(firstWord)) return value;
+    return `eval --script-b64 ${Buffer.from(value, "utf8").toString("base64url")}`;
+  });
+  const chain = chainParts.join(" ; ");
   const cdpEndpoint = extractCdpFromArgv(argv);
   const sessionArgIdx = argv.indexOf("--session");
   const sessionName = sessionArgIdx >= 0 && argv[sessionArgIdx + 1] ? argv[sessionArgIdx + 1] : process.env.XBROWSER_SESSION || "default";
@@ -5556,6 +5564,8 @@ async function handleChainInput(input, argv) {
 }
 async function routeCommand(argvIn, stdinCommands) {
   let argv = argvIn;
+  let chainTokenStart = -1;
+  let chainTokenEnd = -1;
   process.exitCode = 0;
   try {
     if (stdinCommands && stdinCommands.length > 0) {
@@ -5605,6 +5615,8 @@ async function routeCommand(argvIn, stdinCommands) {
         const remainder = chainArg.substring(spaceIdx + 1);
         let remainderParts = remainder.split(/\s+/).filter(Boolean);
         remainderParts = remainderParts.flatMap((part) => part.split(";").filter(Boolean));
+        chainTokenStart = chainArgIdx;
+        chainTokenEnd = chainArgIdx + remainderParts.length;
         argv = [...argv.slice(0, chainArgIdx), possibleCmd, ...remainderParts, ...argv.slice(chainArgIdx + 1)];
       }
     }
@@ -5830,6 +5842,10 @@ async function routeCommand(argvIn, stdinCommands) {
           const globalFlagSet = /* @__PURE__ */ new Set(["--session", "--cdp", "--json", "--yaml", "--help", "-h", "--version", "--output", "-o"]);
           const cleanParts = [];
           for (let i = 0; i < argv.length; i++) {
+            if (chainTokenStart >= 0 && i >= chainTokenStart && i <= chainTokenEnd) {
+              cleanParts.push(argv[i]);
+              continue;
+            }
             if (globalFlagSet.has(argv[i])) continue;
             if (i > 0 && globalFlagSet.has(argv[i - 1]) && !argv[i].startsWith("-")) continue;
             if (argv[i].startsWith("--session=") || argv[i].startsWith("--cdp=")) continue;
@@ -6016,7 +6032,7 @@ Run "xbrowser ${command} ${subCommand} --help" to see available parameters.`
               const targetPage = pages[cmdTabIndex];
               await targetPage.bringToFront().catch(() => {
               });
-              const { setActivePage } = await import("./browser-I3EZY3FL.js");
+              const { setActivePage } = await import("./browser-FIEYZRSV.js");
               setActivePage(session, targetPage);
             }
           }
@@ -6281,7 +6297,7 @@ async function handleRemote(args, options, mode) {
   }
 }
 async function startMcpServer() {
-  const { startMcpStdio } = await import("./server-A5R4OIGX.js");
+  const { startMcpStdio } = await import("./server-HITV2PS7.js");
   startMcpStdio();
 }
 
@@ -6300,7 +6316,7 @@ async function main() {
     const command = process.argv[2];
     const isLongRunning = command === "preview" || command === "serve" || command === "mcp";
     if (!isLongRunning) {
-      const { ensureProcessCanExit } = await import("./browser-I3EZY3FL.js");
+      const { ensureProcessCanExit } = await import("./browser-FIEYZRSV.js");
       await ensureProcessCanExit().catch(() => {
       });
       process.exit(process.exitCode || exitCode);