@xbrowser/cli 1.8.5 → 1.8.7

package/dist/daemon-main.js

@@ -5,7 +5,7 @@ import {
 } from "./chunk-VEDJ5XSQ.js";
 import {
   SessionRecorder
-} from "./chunk-BALOM2HW.js";
+} from "./chunk-FL6DOSWV.js";
 import {
   closeEphemeralContext,
   closeSessionByName,
@@ -21,7 +21,7 @@ import {
   resolveLaunchOpts,
   saveSessionDiskMeta,
   setActivePage
-} from "./chunk-TAHJCCME.js";
+} from "./chunk-HXLMMSU3.js";
 import "./chunk-VJNMAWPZ.js";
 import "./chunk-TNEN6VQ2.js";
 import {
@@ -55,7 +55,7 @@ import {
 // src/executor.ts
 import {
   ok as ok25,
-  fail as fail8,
+  fail as fail9,
   isCommandResult,
   CompositeStorage as CompositeStorage2,
   TipCollector as TipCollector2,
@@ -2283,7 +2283,7 @@ var scrapeCommand = registerCommand({
   scope: "project",
   selectorParams: ["selector"],
   parameters: z15.object({
-    url: z15.string(),
+    url: z15.string().optional(),
     selector: z15.string().optional(),
     timeout: z15.number().default(3e4),
     format: z15.enum(["markdown", "html", "text"]).default("markdown"),
@@ -2296,10 +2296,14 @@ var scrapeCommand = registerCommand({
     const { context, page } = await createEphemeralContext(resolveLaunchOpts(ctx));
     const maxAttempts = p.retries + 1;
     try {
+      const targetUrl = p.url || page.url();
+      if (!targetUrl || targetUrl === "about:blank") {
+        return fail3("URL is required. Provide a URL or connect to a browser (--cdp) with a non-blank page.");
+      }
       let lastError;
       for (let attempt = 1; attempt <= maxAttempts; attempt++) {
         try {
-          await page.goto(p.url, { waitUntil: "commit", timeout: p.timeout });
+          await page.goto(targetUrl, { waitUntil: "commit", timeout: p.timeout });
           await page.waitForSelector("body", { timeout: p.timeout }).catch(() => {
           });
           await page.waitForLoadState("networkidle", Math.min(p.timeout, 8e3)).catch(() => {
@@ -2360,7 +2364,7 @@ var scrapeCommand = registerCommand({
               return { url: location.href, title: document.title, navigation, tables, forms: forms.slice(0, 20), links: links.slice(0, 30), mainText };
             });
             try {
-              persistFromScrape(p.url, structured);
+              persistFromScrape(targetUrl, structured);
             } catch {
             }
             if (p.mode === "smart") {
@@ -2461,7 +2465,7 @@ var scrapeCommand = registerCommand({
 
 // src/commands/map.ts
 import { z as z16 } from "zod";
-import { ok as ok16 } from "@dyyz1993/xcli-core";
+import { ok as ok16, fail as fail4 } from "@dyyz1993/xcli-core";
 
 // src/utils/url.ts
 var SKIP_EXTENSIONS = /* @__PURE__ */ new Set([
@@ -2697,7 +2701,7 @@ var mapCommand = registerCommand({
   description: "Discover all URLs on a website via sitemap and page link extraction",
   scope: "project",
   parameters: z16.object({
-    url: z16.string(),
+    url: z16.string().optional(),
     search: z16.string().optional(),
     sitemap: z16.enum(["include", "only"]).optional(),
     includeSubdomains: z16.boolean().optional(),
@@ -2708,7 +2712,11 @@ var mapCommand = registerCommand({
   handler: async (p, ctx) => {
     const { context, page } = await createEphemeralContext(resolveLaunchOpts(ctx));
     try {
-      const links = await discoverUrls(page, p.url, {
+      const targetUrl = p.url || page.url();
+      if (!targetUrl || targetUrl === "about:blank") {
+        return fail4("URL is required. Provide a URL or connect to a browser (--cdp) with a non-blank page.");
+      }
+      const links = await discoverUrls(page, targetUrl, {
         sitemap: p.sitemap,
         includeSubdomains: p.includeSubdomains,
         allowExternalLinks: p.allowExternalLinks,
@@ -3551,7 +3559,7 @@ ${errors.map((e) => `  - ${e.engine}: ${e.error}`).join("\n")}`
 
 // src/commands/network.ts
 import { z as z19 } from "zod";
-import { ok as ok19, fail as fail4 } from "@dyyz1993/xcli-core";
+import { ok as ok19, fail as fail5 } from "@dyyz1993/xcli-core";
 function extractPath2(url) {
   try {
     const u = new URL(url);
@@ -3716,7 +3724,7 @@ var networkCommand = registerCommand({
     };
     if (p.listen) {
       const page2 = ctx.page;
-      if (!page2) return fail4("No active page. Use --cdp to connect first.");
+      if (!page2) return fail5("No active page. Use --cdp to connect first.");
       const captures = [];
       const consoleMessages = [];
       const wsCaptures = [];
@@ -4096,7 +4104,7 @@ var ENGINE_KEY_ENUM = z20.enum(ALL_ENGINE_KEYS);
 
 // src/commands/snapshot.ts
 import { z as z21 } from "zod";
-import { ok as ok20, fail as fail5, normalizeTips as normalizeTips3 } from "@dyyz1993/xcli-core";
+import { ok as ok20, fail as fail6, normalizeTips as normalizeTips3 } from "@dyyz1993/xcli-core";
 
 // src/runtime/ref-store.ts
 var sessions = /* @__PURE__ */ new Map();
@@ -5067,7 +5075,7 @@ var snapshotCommand = registerCommand({
       persistSemantics(url, aria);
       return ok20({ url, title, aria, text, dom }, normalizeTips3(tips));
     }
-    return fail5(`Unknown snapshot type: ${p.type}`);
+    return fail6(`Unknown snapshot type: ${p.type}`);
   }
 });
 function persistSemantics(url, aria) {
@@ -5236,7 +5244,7 @@ var waitForCommand = registerCommand({
 
 // src/commands/tab.ts
 import { z as z23 } from "zod";
-import { ok as ok22, fail as fail6 } from "@dyyz1993/xcli-core";
+import { ok as ok22, fail as fail7 } from "@dyyz1993/xcli-core";
 var TabParams = z23.object({
   subcommand: z23.enum(["list", "new", "close", "switch"]),
   url: z23.string().optional(),
@@ -5253,7 +5261,7 @@ var tabCommand = registerCommand({
   }),
   handler: async (p, ctx) => {
     if (!ctx.browserContext) {
-      return fail6("No browser context available. Use --cdp to connect to a browser first.");
+      return fail7("No browser context available. Use --cdp to connect to a browser first.");
     }
     const pages = ctx.browserContext.pages();
     switch (p.subcommand) {
@@ -5266,7 +5274,7 @@ var tabCommand = registerCommand({
       case "switch":
         return handleSwitch(p, pages, ctx);
       default:
-        return fail6(`Unknown subcommand: ${p.subcommand}`);
+        return fail7(`Unknown subcommand: ${p.subcommand}`);
     }
   }
 });
@@ -5323,11 +5331,11 @@ async function handleNew(p, _pages, ctx) {
 }
 async function handleClose(p, pages, ctx) {
   if (pages.length <= 1) {
-    return fail6("Cannot close the last remaining tab");
+    return fail7("Cannot close the last remaining tab");
   }
   const closeIndex = p.index ?? pages.indexOf(ctx.page);
   if (closeIndex < 0 || closeIndex >= pages.length) {
-    return fail6(`Invalid tab index: ${closeIndex}. Valid range: 0-${pages.length - 1}`);
+    return fail7(`Invalid tab index: ${closeIndex}. Valid range: 0-${pages.length - 1}`);
   }
   const pageToClose = pages[closeIndex];
   const isActivePage = pageToClose === ctx.page;
@@ -5350,10 +5358,10 @@ async function handleClose(p, pages, ctx) {
 }
 async function handleSwitch(p, pages, ctx) {
   if (p.index === void 0) {
-    return fail6("Parameter --index is required for switch subcommand");
+    return fail7("Parameter --index is required for switch subcommand");
   }
   if (p.index < 0 || p.index >= pages.length) {
-    return fail6(`Invalid tab index: ${p.index}. Valid range: 0-${pages.length - 1}`);
+    return fail7(`Invalid tab index: ${p.index}. Valid range: 0-${pages.length - 1}`);
   }
   const targetPage = pages[p.index];
   await targetPage.bringToFront().catch(() => {
@@ -5605,7 +5613,7 @@ registerCommandDefinition("addinitscript", ["script"]);
 
 // src/commands/find.ts
 import { z as z25 } from "zod";
-import { ok as ok24, fail as fail7, normalizeTips as normalizeTips5 } from "@dyyz1993/xcli-core";
+import { ok as ok24, fail as fail8, normalizeTips as normalizeTips5 } from "@dyyz1993/xcli-core";
 var actionSchema2 = z25.enum(["click", "fill", "type", "select", "hover", "check"]);
 var findCommand = registerCommand({
   name: "find",
@@ -5646,7 +5654,7 @@ var findCommand = registerCommand({
     });
     const count = await locator.count();
     if (count === 0) {
-      return fail7(`No element found with ${p.strategy}="${p.value}"`);
+      return fail8(`No element found with ${p.strategy}="${p.value}"`);
     }
     const tips = [];
     const target = selectTarget(locator, p.strategy);
@@ -5658,15 +5666,15 @@ var findCommand = registerCommand({
       await target.click({ timeout: p.timeout, force: true });
       return okWithTips({ matched: count, selector, action: "click" }, tips);
     } else if (actionName === "fill") {
-      if (actionValue === void 0) return fail7("find fill requires a value");
+      if (actionValue === void 0) return fail8("find fill requires a value");
       await target.fill(actionValue, { timeout: p.timeout, force: true });
       return okWithTips({ matched: count, selector, action: `fill("${actionValue}")` }, tips);
     } else if (actionName === "type") {
-      if (actionValue === void 0) return fail7("find type requires a value");
+      if (actionValue === void 0) return fail8("find type requires a value");
       await target.type(actionValue, { delay: 10, timeout: p.timeout });
       return okWithTips({ matched: count, selector, action: `type("${actionValue}")` }, tips);
     } else if (actionName === "select") {
-      if (actionValue === void 0) return fail7("find select requires a value");
+      if (actionValue === void 0) return fail8("find select requires a value");
       await target.selectOption(actionValue);
       return okWithTips({ matched: count, selector, action: `select("${actionValue}")` }, tips);
     } else if (actionName === "hover") {
@@ -6672,7 +6680,7 @@ async function guardCheck(commandName) {
   }
 }
 function errorResult(message) {
-  return { ...fail8(message), duration: 0 };
+  return { ...fail9(message), duration: 0 };
 }
 function tipsToMessages(tips) {
   if (!tips || tips.length === 0) return [];
@@ -6742,9 +6750,14 @@ async function executeCommand(commandName, params, sessionName = "default", extr
     const { _target: _u, ...rest } = params;
     params = rest;
   }
+  const _tabIndex = params._tabIndex;
+  if (_tabIndex !== void 0) {
+    const { _tabIndex: _u, ...rest } = params;
+    params = rest;
+  }
   let targetPageOverride = null;
   if (_target && extraOpts?.cdpEndpoint) {
-    const { findTargetPage } = await import("./browser-NSSCH4MJ.js");
+    const { findTargetPage } = await import("./browser-LW2MDJE4.js");
     targetPageOverride = await findTargetPage(extraOpts.cdpEndpoint, _target);
     if (!targetPageOverride) {
       return errorResult(`Target "${_target}" not found. Use 'xbrowser targets --cdp ${extraOpts.cdpEndpoint}' to list available pages.`);
@@ -6816,6 +6829,16 @@ async function executeCommand(commandName, params, sessionName = "default", extr
     cliName: "xbrowser",
     tips: new TipCollector2()
   };
+  if (_tabIndex !== void 0 && session?.context) {
+    const pages = session.context.pages();
+    if (_tabIndex >= 0 && _tabIndex < pages.length) {
+      const targetPage = pages[_tabIndex];
+      await targetPage.bringToFront().catch(() => {
+      });
+      setActivePage(session, targetPage);
+      ctx.page = targetPage;
+    }
+  }
   const start = Date.now();
   if (session) {
     streamCommandEvent(session.id, {
@@ -6844,7 +6867,17 @@ async function executeCommand(commandName, params, sessionName = "default", extr
     if (hooks.length > 0 && session?.page) {
       await Promise.all(hooks.map((h) => h.onBeforeCommand?.({ page: session.page, command: commandName, params })));
     }
-    const raw = await command.handler(params, ctx);
+    let raw;
+    const handlerPromise = command.handler(params, ctx);
+    if (extraOpts?.timeout && extraOpts.timeout > 0) {
+      const timeoutMs = extraOpts.timeout;
+      const timeoutPromise = new Promise(
+        (_, reject) => setTimeout(() => reject(new Error(`Command timed out after ${timeoutMs}ms`)), timeoutMs)
+      );
+      raw = await Promise.race([handlerPromise, timeoutPromise]);
+    } else {
+      raw = await handlerPromise;
+    }
     const end = Date.now();
     const duration = end - start;
     let hookOutputs;
@@ -6948,7 +6981,7 @@ async function executeCommand(commandName, params, sessionName = "default", extr
       duration,
       timestamp: start
     });
-    return { ...fail8(errorMessage), duration };
+    return { ...fail9(errorMessage), duration };
   } finally {
   }
 }
@@ -6989,7 +7022,7 @@ async function executeChain(input, options) {
             results.push({
               command: cmdName,
               raw: cmdStr,
-              ...fail8(`Plugin "${cmdName}" requires a sub-command`),
+              ...fail9(`Plugin "${cmdName}" requires a sub-command`),
               duration: 0
             });
             if (type === "and") {
@@ -7008,7 +7041,7 @@ async function executeChain(input, options) {
             results.push({
               command: cmdName,
               raw: cmdStr,
-              ...fail8(`Unknown command "${subCommand}" for plugin "${cmdName}"`),
+              ...fail9(`Unknown command "${subCommand}" for plugin "${cmdName}"`),
               duration: 0
             });
             if (type === "and") {
@@ -7140,7 +7173,7 @@ async function executeChain(input, options) {
             results.push({
               command: `${cmdName} ${subCommand}`,
               raw: cmdStr,
-              ...fail8(errorMessage),
+              ...fail9(errorMessage),
               duration: duration2
             });
             if (type === "and") {

package/dist/index.d.ts

@@ -737,6 +737,7 @@ declare function setWSServer(server: WSServer | null): void;
 declare function executeCommand(commandName: string, params: Record<string, unknown>, sessionName?: string, extraOpts?: {
     cdpEndpoint?: string;
     skipCleanup?: boolean;
+    timeout?: number;
 }): Promise<ExecutionResult>;
 /**
  * Execute a chain of browser commands parsed from a string expression.