@xbrowser/cli 1.5.1 → 1.5.2

package/dist/cli.js

@@ -5407,8 +5407,8 @@ function parseCommandChain(input, options) {
         continue;
       }
       if (char === "," && isSpaceAdjacent(input, i)) {
-        pushCommand();
-        lastOperator = "and";
+        lastOperator = "sequence";
+        flushPipeline();
         continue;
       }
       if (char === "+" && isSpaceAdjacent(input, i)) {
@@ -8920,7 +8920,7 @@ var pluginSearchBuiltin = {
     const query = args[0] || "";
     try {
       const searchOptions = {
-        query,
+        query: query || (options["tag"] || ""),
         tag: options["tag"],
         site: options["site"],
         limit: options["limit"] ? Number.parseInt(String(options["limit"])) : 20
@@ -10525,7 +10525,11 @@ Total: ${enrichedPlugins.length} plugins`);
     case "reload": {
       const name = subArgs[0];
       if (!name) outputError("Usage: xbrowser plugin reload <name>");
-      (await getPluginLoader()).reloadPlugin(name);
+      try {
+        await (await getPluginLoader()).reloadPlugin(name);
+      } catch {
+        outputError(`Plugin "${name}" not found. Use 'xbrowser plugin list' to see installed plugins.`);
+      }
       outputResult({ ok: true, name }, mode);
       break;
     }
@@ -12485,13 +12489,24 @@ async function routeCommand(argvIn, stdinCommands) {
       await handleChainInput(argv[0], argv);
       return;
     }
-    if (argv[0] && argv[0].includes(" ")) {
-      const spaceIdx = argv[0].indexOf(" ");
-      const possibleCmd = argv[0].substring(0, spaceIdx);
+    const globalFlags = /* @__PURE__ */ new Set(["--session", "--cdp", "--json", "--yaml", "--output", "--timeout", "--help", "-h", "--version"]);
+    let chainArgIdx = -1;
+    for (let i = 0; i < argv.length; i++) {
+      if (globalFlags.has(argv[i])) continue;
+      if (globalFlags.has(argv[i]) || i > 0 && globalFlags.has(argv[i - 1]) && !argv[i].startsWith("-")) continue;
+      if (argv[i].includes(" ") && /^[a-zA-Z]/.test(argv[i])) {
+        chainArgIdx = i;
+        break;
+      }
+    }
+    if (chainArgIdx >= 0) {
+      const chainArg = argv[chainArgIdx];
+      const spaceIdx = chainArg.indexOf(" ");
+      const possibleCmd = chainArg.substring(0, spaceIdx);
       if (/^[a-zA-Z][\w-]*$/.test(possibleCmd)) {
-        const remainder = argv[0].substring(spaceIdx + 1);
+        const remainder = chainArg.substring(spaceIdx + 1);
         const remainderParts = remainder.split(/\s+/).filter(Boolean);
-        argv = [possibleCmd, ...remainderParts, ...argv.slice(1)];
+        argv = [...argv.slice(0, chainArgIdx), possibleCmd, ...remainderParts, ...argv.slice(chainArgIdx + 1)];
       }
     }
   } catch (e) {
@@ -12685,7 +12700,15 @@ async function routeCommand(argvIn, stdinCommands) {
         const internalLoader = loader.getCore().loader;
         const site = internalLoader.getSite(command);
         if (!site) {
-          const fullInput = argv.join(" ");
+          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 (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;
+            cleanParts.push(argv[i]);
+          }
+          const fullInput = cleanParts.join(" ");
           if (isChainInput(fullInput)) {
             const chainResult = await executeChain(fullInput, { cdpEndpoint, sessionName });
             for (const step of chainResult.steps) {

package/dist/daemon-main.js

@@ -5368,8 +5368,8 @@ function parseCommandChain(input, options) {
         continue;
       }
       if (char === "," && isSpaceAdjacent(input, i)) {
-        pushCommand();
-        lastOperator = "and";
+        lastOperator = "sequence";
+        flushPipeline();
         continue;
       }
       if (char === "+" && isSpaceAdjacent(input, i)) {

package/dist/index.js

@@ -5724,8 +5724,8 @@ function parseCommandChain(input, options) {
         continue;
       }
       if (char === "," && isSpaceAdjacent(input, i)) {
-        pushCommand();
-        lastOperator = "and";
+        lastOperator = "sequence";
+        flushPipeline();
         continue;
       }
       if (char === "+" && isSpaceAdjacent(input, i)) {
@@ -9255,7 +9255,7 @@ var pluginSearchBuiltin = {
     const query = args[0] || "";
     try {
       const searchOptions = {
-        query,
+        query: query || (options["tag"] || ""),
         tag: options["tag"],
         site: options["site"],
         limit: options["limit"] ? Number.parseInt(String(options["limit"])) : 20
@@ -10865,7 +10865,11 @@ Total: ${enrichedPlugins.length} plugins`);
     case "reload": {
       const name = subArgs[0];
       if (!name) outputError("Usage: xbrowser plugin reload <name>");
-      (await getPluginLoader()).reloadPlugin(name);
+      try {
+        await (await getPluginLoader()).reloadPlugin(name);
+      } catch {
+        outputError(`Plugin "${name}" not found. Use 'xbrowser plugin list' to see installed plugins.`);
+      }
       outputResult({ ok: true, name }, mode);
       break;
     }
@@ -12825,13 +12829,24 @@ async function routeCommand(argvIn, stdinCommands) {
       await handleChainInput(argv[0], argv);
       return;
     }
-    if (argv[0] && argv[0].includes(" ")) {
-      const spaceIdx = argv[0].indexOf(" ");
-      const possibleCmd = argv[0].substring(0, spaceIdx);
+    const globalFlags = /* @__PURE__ */ new Set(["--session", "--cdp", "--json", "--yaml", "--output", "--timeout", "--help", "-h", "--version"]);
+    let chainArgIdx = -1;
+    for (let i = 0; i < argv.length; i++) {
+      if (globalFlags.has(argv[i])) continue;
+      if (globalFlags.has(argv[i]) || i > 0 && globalFlags.has(argv[i - 1]) && !argv[i].startsWith("-")) continue;
+      if (argv[i].includes(" ") && /^[a-zA-Z]/.test(argv[i])) {
+        chainArgIdx = i;
+        break;
+      }
+    }
+    if (chainArgIdx >= 0) {
+      const chainArg = argv[chainArgIdx];
+      const spaceIdx = chainArg.indexOf(" ");
+      const possibleCmd = chainArg.substring(0, spaceIdx);
       if (/^[a-zA-Z][\w-]*$/.test(possibleCmd)) {
-        const remainder = argv[0].substring(spaceIdx + 1);
+        const remainder = chainArg.substring(spaceIdx + 1);
         const remainderParts = remainder.split(/\s+/).filter(Boolean);
-        argv = [possibleCmd, ...remainderParts, ...argv.slice(1)];
+        argv = [...argv.slice(0, chainArgIdx), possibleCmd, ...remainderParts, ...argv.slice(chainArgIdx + 1)];
       }
     }
   } catch (e) {
@@ -13025,7 +13040,15 @@ async function routeCommand(argvIn, stdinCommands) {
         const internalLoader = loader.getCore().loader;
         const site = internalLoader.getSite(command);
         if (!site) {
-          const fullInput = argv.join(" ");
+          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 (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;
+            cleanParts.push(argv[i]);
+          }
+          const fullInput = cleanParts.join(" ");
           if (isChainInput(fullInput)) {
             const chainResult = await executeChain(fullInput, { cdpEndpoint, sessionName });
             for (const step of chainResult.steps) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xbrowser/cli",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "Browser automation CLI for web scraping, headless browsing, SEO analysis, and AI agent workflows. A command-line alternative to Playwright, Puppeteer, and Selenium.",
   "type": "module",
   "bin": {