@xbrowser/cli 1.8.4 → 1.8.6

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   SessionRecorder
-} from "./chunk-ACFE6PKF.js";
+} from "./chunk-RMYEHTLS.js";
 import {
   addKnownIssue,
   getKnowledgePath,
@@ -25,7 +25,7 @@ import {
   resolveLaunchOpts,
   saveSessionDiskMeta,
   setActivePage
-} from "./chunk-35DOHDTA.js";
+} from "./chunk-SJLRCE6N.js";
 import "./chunk-TNEN6VQ2.js";
 import {
   forwardCommandLog,
@@ -7205,9 +7205,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-KVTJQKBA.js");
+    const { findTargetPage } = await import("./browser-XPKM344Y.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.`);
@@ -7279,6 +7284,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, {
@@ -7307,7 +7322,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;
@@ -7883,16 +7908,29 @@ var configBuiltin = {
   execute: async (args, _options, _ctx) => {
     const [subcommand, ...rest] = args;
     if (!subcommand || subcommand === "list") {
+      let flatten2 = function(obj, prefix = "") {
+        const entries2 = [];
+        for (const [k, v] of Object.entries(obj)) {
+          const fullKey = prefix ? `${prefix}.${k}` : k;
+          if (v && typeof v === "object" && !Array.isArray(v)) {
+            entries2.push(...flatten2(v, fullKey));
+          } else {
+            entries2.push({ key: fullKey, value: v });
+          }
+        }
+        return entries2;
+      };
+      var flatten = flatten2;
       const config = loadConfig();
-      const keys = Object.keys(config);
-      if (keys.length === 0) {
+      const entries = flatten2(config);
+      if (entries.length === 0) {
         console.log("Configuration is empty");
         return;
       }
       console.log("Configuration:");
       console.log("");
-      for (const k of keys) {
-        console.log(`  ${k} = ${config[k]}`);
+      for (const { key, value } of entries) {
+        console.log(`  ${key} = ${value}`);
       }
       return;
     }
@@ -8691,6 +8729,39 @@ function outputError(message) {
   console.error(formatted);
   process.exit(1);
 }
+function outputEnvelope(result, meta, mode) {
+  if (mode !== "json" && mode !== "yaml") {
+    if (!result.success) {
+      outputError(result.message || "Unknown error");
+      return;
+    }
+    outputResult(result.data, mode);
+    return;
+  }
+  const { command, ...extraMeta } = meta;
+  const commandResult = {
+    success: result.success,
+    data: result.data,
+    message: result.message,
+    tips: [],
+    meta: {
+      duration: result.duration ?? 0,
+      ...extraMeta
+    }
+  };
+  const formatted = outputFormatter.formatEnvelope(commandResult, {
+    command,
+    extraMeta,
+    mode
+  });
+  console.log(formatted);
+  if (result.tips?.length) {
+    for (const tip of result.tips) {
+      const text = typeof tip === "string" ? tip : tip.message;
+      if (text) console.error(`  \u{1F4A1} ${text}`);
+    }
+  }
+}
 
 // src/builtins/plugin.ts
 var pluginLoader2 = null;
@@ -10250,9 +10321,13 @@ async function handleBrowserCommand(command, args, options, sessionName, mode, c
   if (target) {
     params = { ...params, _target: target };
   }
+  const tabIndex = options.tab;
+  if (tabIndex !== void 0) {
+    params = { ...params, _tabIndex: Number(tabIndex) };
+  }
   const result = cdpEndpoint ? await executeCommand(cmdName, params, sessionName, { cdpEndpoint }) : await executeCommand(cmdName, params, sessionName);
   if (mode === "json" || mode === "yaml") {
-    outputResult(result, mode);
+    outputEnvelope(result, { command: cmdName }, mode);
   } else if (!result.success) {
     outputError(result.message || "Command failed");
   } else {
@@ -10312,7 +10387,7 @@ async function handleSession(args, options, mode, _cdpEndpoint) {
           }
         } catch {
         }
-        outputResult({ ok: true, closed: count, all: true }, mode);
+        outputEnvelope({ success: true, data: { closed: count, all: true } }, { command: "session close" }, mode);
       } else {
         const name = options.session || options.name || process.env.XBROWSER_SESSION || "default";
         try {
@@ -10320,7 +10395,7 @@ async function handleSession(args, options, mode, _cdpEndpoint) {
         } catch {
         }
         await closeSession(name);
-        outputResult({ ok: true, name }, mode);
+        outputEnvelope({ success: true, data: { name } }, { command: "session close" }, mode);
       }
       break;
     }
@@ -10328,10 +10403,10 @@ async function handleSession(args, options, mode, _cdpEndpoint) {
     case "ls": {
       try {
         const sessions2 = await forwardSessionList();
-        outputResult({ sessions: sessions2 }, mode);
+        outputEnvelope({ success: true, data: { sessions: sessions2 } }, { command: "session list" }, mode);
       } catch {
         const sessions2 = await listSessions();
-        outputResult({ sessions: sessions2 }, mode);
+        outputEnvelope({ success: true, data: { sessions: sessions2 } }, { command: "session list" }, mode);
       }
       break;
     }
@@ -10346,7 +10421,7 @@ async function handleSession(args, options, mode, _cdpEndpoint) {
         await stopDaemonProcess();
       } catch {
       }
-      outputResult({ ok: true, name, killed: true, daemon: "stopped" }, mode);
+      outputEnvelope({ success: true, data: { name, killed: true, daemon: "stopped" } }, { command: "session kill" }, mode);
       break;
     }
     case "kill-all": {
@@ -10365,7 +10440,7 @@ async function handleSession(args, options, mode, _cdpEndpoint) {
       } catch {
       }
       const cleaned = cleanSessionFiles();
-      outputResult({ ok: true, sessionsCleaned: cleaned, daemon: "killed" }, mode);
+      outputEnvelope({ success: true, data: { sessionsCleaned: cleaned, daemon: "killed" } }, { command: "session kill-all" }, mode);
       break;
     }
     default:
@@ -10485,7 +10560,7 @@ async function handleSearch(args, options, mode) {
     }
   }
   if (mode === "json") {
-    outputResult({ results, total: results.length }, mode);
+    outputEnvelope({ success: true, data: { results, total: results.length } }, { command: "plugin search" }, mode);
   } else {
     if (results.length === 0) {
       console.log("No plugins found");
@@ -10514,7 +10589,7 @@ async function handlePluginInfo(args, options, mode) {
     if (pluginInfo) {
       const d = pluginInfo;
       if (mode === "json") {
-        outputResult({ source: "marketplace", ...d }, mode);
+        outputEnvelope({ success: true, data: { source: "marketplace", ...d } }, { command: "plugin info" }, mode);
         return;
       }
       console.log(`\u540D\u79F0: ${d.name || ""}`);
@@ -10540,7 +10615,7 @@ async function handlePluginInfo(args, options, mode) {
       const pkg = latest && versions?.[latest];
       if (pkg) {
         if (mode === "json") {
-          outputResult({ source: "npm", name: pkg.name, version: latest, description: pkg.description }, mode);
+          outputEnvelope({ success: true, data: { source: "npm", name: pkg.name, version: latest, description: pkg.description } }, { command: "plugin info" }, mode);
           return;
         }
         console.log(`\u540D\u79F0: ${pkg.name || ""}`);
@@ -10569,7 +10644,7 @@ async function handlePluginSchema(args, mode) {
     return;
   }
   if (mode === "json") {
-    outputResult(contract, mode);
+    outputEnvelope({ success: true, data: contract }, { command: "plugin schema" }, mode);
     return;
   }
   if ("commands" in contract) {
@@ -10647,8 +10722,9 @@ async function handlePlugin(args, options, mode) {
         }
       } catch {
       }
-      outputResult(
-        { ok: true, name: result.name, source: result.source, path: result.path },
+      outputEnvelope(
+        { success: true, data: { name: result.name, source: result.source, path: result.path } },
+        { command: "plugin install" },
         mode
       );
       break;
@@ -10667,7 +10743,7 @@ async function handlePlugin(args, options, mode) {
         await loader.reloadPlugin(name);
       } catch {
       }
-      outputResult({ ok: true, name }, mode);
+      outputEnvelope({ success: true, data: { name } }, { command: "plugin uninstall" }, mode);
       break;
     }
     case "list": {
@@ -10689,7 +10765,7 @@ async function handlePlugin(args, options, mode) {
         };
       });
       if (mode === "json") {
-        outputResult({ plugins: enrichedPlugins }, mode);
+        outputEnvelope({ success: true, data: { plugins: enrichedPlugins } }, { command: "plugin list" }, mode);
       } else {
         if (enrichedPlugins.length === 0) {
           console.log("No plugins installed");
@@ -10725,7 +10801,7 @@ Total: ${enrichedPlugins.length} plugins`);
       } catch {
         outputError(`Plugin "${name}" not found. Use 'xbrowser plugin list' to see installed plugins.`);
       }
-      outputResult({ ok: true, name }, mode);
+      outputEnvelope({ success: true, data: { name } }, { command: "plugin reload" }, mode);
       break;
     }
     case "search":
@@ -10757,24 +10833,22 @@ function handleDaemon(args, options, mode) {
     case "start": {
       const port = options.port ? Number(options.port) : 9224;
       startDaemonProcess(port).then(
-        (config) => outputResult({ ok: true, pid: config.pid, port: config.port }, mode)
+        (config) => outputEnvelope({ success: true, data: { pid: config.pid, port: config.port } }, { command: "daemon start" }, mode)
       ).catch(
         (e) => outputError(e instanceof Error ? e.message : String(e))
       );
       break;
     }
     case "stop": {
-      stopDaemonProcess().then(() => outputResult({ ok: true }, mode)).catch(
+      stopDaemonProcess().then(() => outputEnvelope({ success: true, data: {} }, { command: "daemon stop" }, mode)).catch(
         (e) => outputError(e instanceof Error ? e.message : String(e))
       );
       break;
     }
     case "status": {
       const status = getDaemonProcessStatus();
-      outputResult(
-        status.running ? { running: true, pid: status.pid, port: status.port } : { running: false },
-        mode
-      );
+      const statusData = status.running ? { running: true, pid: status.pid, port: status.port } : { running: false };
+      outputEnvelope({ success: true, data: statusData }, { command: "daemon status" }, mode);
       break;
     }
     default:
@@ -11152,7 +11226,7 @@ async function handleFilter(args, _mode, options) {
   console.log(`  Original: ${result.originalCount}, After: ${result.filteredCount}, Removed: ${result.removed} (${result.percentage}%)`);
 }
 async function handleGeneratePlugin(sessionName, pluginName, outputDir) {
-  const { SessionRecorder: SessionRecorder2 } = await import("./session-recorder-RTDGURIJ.js");
+  const { SessionRecorder: SessionRecorder2 } = await import("./session-recorder-33UKWCIR.js");
   const { readSiteKnowledge: readSiteKnowledge2, toMarkdown } = await import("./site-knowledge-SYC6VCDB.js");
   const { mkdirSync: mkdirSync10, writeFileSync: writeFileSync12 } = await import("fs");
   const { join: join14 } = await import("path");
@@ -12499,7 +12573,8 @@ var KNOWN_GLOBAL_OPTIONS = /* @__PURE__ */ new Set([
   "port",
   "token",
   "timeout",
-  "headless"
+  "headless",
+  "tab"
 ]);
 function showCommandHelp(siteName, cmd, siteConfig, mode) {
   const c = cmd;
@@ -12653,20 +12728,28 @@ async function handleEvalMode(argv) {
 }
 async function handleChainInput(input, argv) {
   const cdpEndpoint = argv ? extractCdpFromArgv(argv) : void 0;
-  const jsonMode = argv ? argv.some((a) => a === "--json" || a.startsWith("--json=") || a.includes(" --json") || a.startsWith("--json")) || argv.includes("-j") : false;
+  const hasJson = argv ? argv.some((a) => a === "--json" || a.startsWith("--json=") || a.includes(" --json") || a.startsWith("--json")) || argv.includes("-j") : false;
+  const hasYaml = argv ? argv.some((a) => a === "--yaml" || a.startsWith("--yaml=")) : false;
+  const mode = hasJson ? "json" : hasYaml ? "yaml" : "text";
   const chainResult = await executeChain(input, { cdpEndpoint });
-  if (jsonMode) {
-    const output = {
-      success: chainResult.success,
-      steps: chainResult.steps.map((s) => ({
-        command: s.raw,
-        success: s.success,
-        data: s.data,
-        duration: s.duration,
-        ...s.hookOutputs?.length ? { hooks: s.hookOutputs } : {}
-      }))
-    };
-    console.log(JSON.stringify(output, null, 2));
+  if (mode === "json" || mode === "yaml") {
+    outputEnvelope(
+      {
+        success: chainResult.success,
+        data: {
+          steps: chainResult.steps.map((s) => ({
+            command: s.raw,
+            success: s.success,
+            data: s.data,
+            duration: s.duration,
+            ...s.hookOutputs?.length ? { hooks: s.hookOutputs } : {}
+          }))
+        },
+        duration: chainResult.totalDuration
+      },
+      { command: "chain", totalSteps: chainResult.steps.length },
+      mode
+    );
   } else {
     printChainResult(chainResult);
   }
@@ -12733,7 +12816,15 @@ async function routeCommand(argvIn, stdinCommands) {
   const sessionName = options.session || process.env.XBROWSER_SESSION || "default";
   const cdpEndpoint = options.cdp || process.env.XBROWSER_CDP;
   if (options.version || options.v && positional.length === 0) {
-    console.log(`xbrowser v${version}`);
+    if (mode === "json") {
+      outputEnvelope(
+        { success: true, data: { version, name: "@xbrowser/cli" } },
+        { command: "version" },
+        mode
+      );
+    } else {
+      console.log(`xbrowser v${version}`);
+    }
     return;
   }
   if (positional.length === 0) {
@@ -12929,18 +13020,23 @@ async function routeCommand(argvIn, stdinCommands) {
           if (isChainInput(fullInput)) {
             const chainResult = await executeChain(fullInput, { cdpEndpoint, sessionName });
             if (mode === "json" || mode === "yaml") {
-              const output = {
-                success: chainResult.success,
-                steps: chainResult.steps.map((s) => ({
-                  command: s.raw,
-                  success: s.success,
-                  data: s.data,
-                  duration: s.duration
-                })),
-                totalDuration: chainResult.totalDuration,
-                ...chainResult.stoppedReason ? { stoppedReason: chainResult.stoppedReason } : {}
-              };
-              outputResult(output, mode);
+              outputEnvelope(
+                {
+                  success: chainResult.success,
+                  data: {
+                    steps: chainResult.steps.map((s) => ({
+                      command: s.raw,
+                      success: s.success,
+                      data: s.data,
+                      duration: s.duration
+                    })),
+                    ...chainResult.stoppedReason ? { stoppedReason: chainResult.stoppedReason } : {}
+                  },
+                  duration: chainResult.totalDuration
+                },
+                { command: "chain", totalSteps: chainResult.steps.length },
+                mode
+              );
               if (!chainResult.success) throw new Error("Command failed");
               return;
             }
@@ -13085,6 +13181,17 @@ Run "xbrowser ${command} ${subCommand} --help" to see available parameters.`
               session = await createSession(sessionName, void 0, cdpEndpoint ? { cdpEndpoint } : {});
             }
           }
+          const cmdTabIndex = options.tab !== void 0 ? Number(options.tab) : void 0;
+          if (cmdTabIndex !== void 0 && session?.context) {
+            const pages = session.context.pages();
+            if (cmdTabIndex >= 0 && cmdTabIndex < pages.length) {
+              const targetPage = pages[cmdTabIndex];
+              await targetPage.bringToFront().catch(() => {
+              });
+              const { setActivePage: setActivePage2 } = await import("./browser-XPKM344Y.js");
+              setActivePage2(session, targetPage);
+            }
+          }
           const ctx = {
             args: cmdArgsForPlugin,
             options,
@@ -13162,22 +13269,17 @@ Run "xbrowser ${command} ${subCommand} --help" to see available parameters.`
             const outputData = isCommandResult2(result) ? result.data : result && typeof result === "object" ? result.data ?? result : result;
             const tips = isCommandResult2(result) ? result.tips : result && typeof result === "object" ? result.tips : void 0;
             if (mode === "json" || mode === "yaml") {
-              const finalOutput = {
-                data: outputData
-              };
-              if (injectedViewerUrl) {
-                finalOutput.viewerUrl = injectedViewerUrl;
-              }
-              if (tips?.length) {
-                finalOutput.tips = tips;
-              }
-              if (hookOutputs.length > 0) {
-                finalOutput.hooks = hookOutputs;
-              }
-              console.log(outputFormatter2.format(finalOutput, { mode, color: false, emoji: false }));
-              if (tips?.length) {
-                for (const tip of tips) console.error(`\u{1F4A1} ${typeof tip === "string" ? tip : tip.message}`);
-              }
+              const resultSuccess = isCommandResult2(result) ? result.success !== false : true;
+              const resultMsg = isCommandResult2(result) ? result.message : void 0;
+              const duration = Date.now() - cmdStart;
+              const envelopeMeta = { command: `${command} ${subCommand}` };
+              if (injectedViewerUrl) envelopeMeta.viewerUrl = injectedViewerUrl;
+              if (hookOutputs.length > 0) envelopeMeta.hooks = hookOutputs;
+              outputEnvelope(
+                { success: resultSuccess, data: outputData, message: resultMsg, tips, duration },
+                envelopeMeta,
+                mode
+              );
             } else {
               console.log(outputFormatter2.format(outputData, { mode: "text", color: true, emoji: true }));
               if (tips?.length) {
@@ -13359,7 +13461,7 @@ async function main() {
     const command = process.argv[2];
     const isLongRunning = command === "preview" || command === "serve";
     if (!isLongRunning) {
-      const { ensureProcessCanExit } = await import("./browser-KVTJQKBA.js");
+      const { ensureProcessCanExit } = await import("./browser-XPKM344Y.js");
       await ensureProcessCanExit().catch(() => {
       });
       process.exit(exitCode);

package/dist/daemon-main.js

@@ -5,7 +5,7 @@ import {
 } from "./chunk-VEDJ5XSQ.js";
 import {
   SessionRecorder
-} from "./chunk-2SVQTI2O.js";
+} from "./chunk-FL6DOSWV.js";
 import {
   closeEphemeralContext,
   closeSessionByName,
@@ -21,7 +21,7 @@ import {
   resolveLaunchOpts,
   saveSessionDiskMeta,
   setActivePage
-} from "./chunk-6QGZN5U7.js";
+} from "./chunk-HXLMMSU3.js";
 import "./chunk-VJNMAWPZ.js";
 import "./chunk-TNEN6VQ2.js";
 import {
@@ -6742,9 +6742,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-4PIVOYCW.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 +6821,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 +6859,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;

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.