@xbrowser/cli 1.0.2 → 1.0.3

package/dist/cli.js

@@ -25,8 +25,8 @@ import {
   resolveLaunchOpts,
   saveSessionDiskMeta,
   setActivePage
-} from "./chunk-CAFNSGYM.js";
-import "./chunk-BBMRDUYQ.js";
+} from "./chunk-DKWR54XQ.js";
+import "./chunk-TNEN6VQ2.js";
 import {
   forwardCommandLog,
   forwardNetworkAnalyze,
@@ -54,11 +54,16 @@ import {
   killAllDaemonProcesses,
   startDaemonProcess,
   stopDaemonProcess
-} from "./chunk-Q4IGYTKR.js";
-import "./chunk-KFQGP6VL.js";
+} from "./chunk-6WOSXSCQ.js";
+import {
+  errMsg
+} from "./chunk-GDKLH7ZY.js";
+import {
+  __require
+} from "./chunk-KFQGP6VL.js";
 
 // src/router.ts
-import { parseArgs, outputFormatter as outputFormatter2, isCommandResult as isCommandResult2, helpGenerator as helpGenerator2, TipCollector as TipCollector2, normalizeTips as normalizeTips7, tip as makeTip } from "@dyyz1993/xcli-core";
+import { parseArgs, outputFormatter as outputFormatter2, isCommandResult as isCommandResult2, helpGenerator as helpGenerator2, TipCollector as TipCollector3, normalizeTips as normalizeTips7, tip as makeTip } from "@dyyz1993/xcli-core";
 
 // src/utils/positional-params.ts
 import { unquote } from "@dyyz1993/xcli-core";
@@ -170,6 +175,11 @@ function parsePluginParams(args, schema, base = {}) {
   return result;
 }
 
+// src/utils/zod-internal.ts
+function asZodSchema(value) {
+  return value;
+}
+
 // src/version.ts
 import { createRequire } from "module";
 var require2 = createRequire(import.meta.url);
@@ -181,8 +191,8 @@ import {
   ok as ok25,
   fail as fail7,
   isCommandResult,
-  CompositeStorage,
-  TipCollector,
+  CompositeStorage as CompositeStorage2,
+  TipCollector as TipCollector2,
   normalizeTips as normalizeTips6,
   configureArchiveStore,
   appendCommandToArchive,
@@ -190,6 +200,67 @@ import {
   unquote as unquote2
 } from "@dyyz1993/xcli-core";
 
+// src/utils/stub-context.ts
+import { TipCollector, CompositeStorage } from "@dyyz1993/xcli-core";
+var CONFIG_DIR = __require("path").join(__require("os").homedir(), ".xbrowser");
+var NoopSiteInstance = class {
+  name = "stub";
+  url = "";
+  config = { name: "stub" };
+  command() {
+    return this;
+  }
+  group() {
+    return this;
+  }
+  login() {
+    return this;
+  }
+  logout() {
+    return this;
+  }
+  async isLoggedIn() {
+    return true;
+  }
+  async requireLogin() {
+  }
+  getStorage() {
+    return new CompositeStorage("stub", CONFIG_DIR, "xbrowser");
+  }
+  getAllCommands() {
+    return [];
+  }
+  getCommand() {
+    return null;
+  }
+  getOriginalHandler() {
+    return void 0;
+  }
+  async executeLogin() {
+  }
+  async executeLogout() {
+  }
+  async restoreLogin() {
+    return false;
+  }
+};
+function createStubContext(pluginName) {
+  return {
+    args: [],
+    options: {},
+    cwd: process.cwd(),
+    storage: new CompositeStorage(pluginName, CONFIG_DIR, "xbrowser"),
+    output: { mode: "text", showTips: false, color: false, emoji: false },
+    error: (msg) => {
+      throw new Error(msg);
+    },
+    config: {},
+    site: new NoopSiteInstance(),
+    cliName: "xbrowser",
+    tips: new TipCollector()
+  };
+}
+
 // src/commands/navigation.ts
 import { z } from "zod";
 import { ok } from "@dyyz1993/xcli-core";
@@ -237,7 +308,7 @@ async function detectSsr(page) {
   try {
     const result = await page.evaluate((vars) => {
       for (const varName of vars) {
-        const value = window[varName];
+        const value = Reflect.get(window, varName);
         if (value != null && typeof value === "object") {
           const keys = Object.keys(value).slice(0, 10);
           return { variable: varName, keys };
@@ -1586,7 +1657,7 @@ var healthCheckCommand = registerCommand({
             issues.push({
               severity: "error",
               category: "links",
-              message: `Broken link (fetch error): ${href} \u2014 ${err.message || "unknown"}`
+              message: `Broken link (fetch error): ${href} \u2014 ${errMsg(err) || "unknown"}`
             });
           }
         }
@@ -4685,7 +4756,7 @@ async function actOnPage(page, sessionId, input) {
       ref: normalizedRef,
       success: false,
       reason: "browser_error",
-      message: error.message,
+      message: errMsg(error),
       stale,
       screenHash: hash,
       target: refMatch?.target
@@ -4769,7 +4840,7 @@ async function waitForPage(page, input) {
       matched: input.selector ? "selector" : input.text ? "text" : input.url ? "url" : input.load ? "load" : input.fn ? "fn" : "screenHashChanged",
       timeout,
       elapsed: Date.now() - startedAt,
-      message: error.message
+      message: errMsg(error)
     };
   }
   return {
@@ -5704,11 +5775,11 @@ async function detectWebdriverExposure(page) {
   try {
     const webdriver = await page.evaluate(() => {
       return {
-        webdriver: window.navigator && window.navigator instanceof Object ? window.navigator.webdriver : void 0,
+        webdriver: navigator.webdriver,
         webdriverScriptFn: !!window.__webdriver_script_fn,
         webdriverEvaluate: !!window.__webdriver_evaluate,
         chrome: !!window.chrome,
-        permissions: window.navigator && window.navigator instanceof Object ? window.navigator.permissions : void 0
+        permissions: navigator.permissions
       };
     }).catch(() => null);
     if (!webdriver) {
@@ -6068,19 +6139,26 @@ var patched = false;
 function patchLoginRequired() {
   if (patched) return;
   patched = true;
-  const proto = SiteInstanceImpl.prototype;
-  const original = proto.command;
-  proto.command = function(name, cmd) {
-    const result = original.call(this, name, cmd);
+  const target = SiteInstanceImpl.prototype;
+  const originalCommand = target.command;
+  const wrapped = function(...args) {
+    const result = originalCommand.apply(this, args);
+    const [name, cmd] = args;
     const loginRequired = cmd.loginRequired;
     if (loginRequired) {
-      const entry = this.commands.get(name);
+      const commands = this.commands;
+      const entry = commands?.get(name);
       if (entry) {
         entry.loginRequired = loginRequired;
       }
     }
     return result;
   };
+  Object.defineProperty(target, "command", {
+    value: wrapped,
+    writable: true,
+    configurable: true
+  });
 }
 
 // src/plugin/loader.ts
@@ -6774,15 +6852,14 @@ var HOOK_REGISTRY = {
   recorder: {
     name: "recorder",
     onAfterCommand: async (ctx) => {
-      const ctxAny = ctx;
-      const logs = ctxAny.__commandLogs || [];
+      const logs = ("__commandLogs" in ctx ? ctx.__commandLogs : void 0) || [];
       logs.push({
         timestamp: Date.now(),
         command: ctx.command,
         params: JSON.parse(JSON.stringify(ctx.params)),
         duration: ctx.duration
       });
-      ctxAny.__commandLogs = logs;
+      Reflect.set(ctx, "__commandLogs", logs);
       return void 0;
     }
   }
@@ -6814,11 +6891,11 @@ import { homedir as homedir5 } from "os";
 import { join as join5 } from "path";
 var NAVIGATION_COMMANDS = /* @__PURE__ */ new Set(["goto", "back", "forward", "refresh"]);
 var snapshotHintShown = /* @__PURE__ */ new WeakSet();
-var CONFIG_DIR = join5(homedir5(), ".xbrowser");
+var CONFIG_DIR2 = join5(homedir5(), ".xbrowser");
 var storageCache = /* @__PURE__ */ new Map();
 function getPluginStorage(pluginName) {
   if (!storageCache.has(pluginName)) {
-    storageCache.set(pluginName, new CompositeStorage(pluginName, CONFIG_DIR, "xbrowser"));
+    storageCache.set(pluginName, new CompositeStorage2(pluginName, CONFIG_DIR2, "xbrowser"));
   }
   return storageCache.get(pluginName);
 }
@@ -6883,7 +6960,7 @@ async function executeCommand(commandName, params, sessionName = "default", extr
   }
   let targetPageOverride = null;
   if (_target && extraOpts?.cdpEndpoint) {
-    const { findTargetPage } = await import("./browser-R56O3CW6.js");
+    const { findTargetPage } = await import("./browser-5CTOA2WS.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.`);
@@ -6900,7 +6977,7 @@ async function executeCommand(commandName, params, sessionName = "default", extr
     params = result.data;
   }
   if (command.scope !== "cli" && !process.env.XBROWSER_DAEMON_WORKER) {
-    const { forwardExec } = await import("./daemon-client-UZZEHHIV.js");
+    const { forwardExec } = await import("./daemon-client-3JOKX2L2.js");
     const result = await forwardExec(commandName, params, sessionName, extraOpts?.cdpEndpoint);
     if (result) return result;
   }
@@ -6951,9 +7028,9 @@ async function executeCommand(commandName, params, sessionName = "default", extr
       throw new Error(msg);
     },
     config: {},
-    site: {},
+    site: new NoopSiteInstance(),
     cliName: "xbrowser",
-    tips: new TipCollector()
+    tips: new TipCollector2()
   };
   const start = Date.now();
   if (session) {
@@ -7066,7 +7143,7 @@ async function executeCommand(commandName, params, sessionName = "default", extr
   } catch (err) {
     const end = Date.now();
     const duration = end - start;
-    const errorMessage = err.message;
+    const errorMessage = errMsg(err);
     if (session) {
       streamCommandEvent(session.id, {
         sessionId: session.id,
@@ -7179,7 +7256,7 @@ async function executeChain(input, options) {
             config: {},
             site,
             cliName: "xbrowser",
-            tips: new TipCollector()
+            tips: new TipCollector2()
           };
           const start2 = Date.now();
           try {
@@ -7266,7 +7343,7 @@ async function executeChain(input, options) {
             }
           } catch (err) {
             const duration2 = Date.now() - start2;
-            const errorMessage = err.message;
+            const errorMessage = errMsg(err);
             recordArchive(session.id, sessionName, {
               step: results.length,
               command: `${cmdName} ${subCommand}`,
@@ -7669,7 +7746,8 @@ async function ensureProxyFetch() {
         const body = init?.body;
         if (body instanceof globalThis.FormData && !(body instanceof UFormData)) {
           const ufd = new UFormData();
-          body.forEach((value, key) => {
+          const domFormData = body;
+          domFormData.forEach((value, key) => {
             if (value instanceof Blob) {
               ufd.append(key, value, value.name || "file");
             } else {
@@ -8584,7 +8662,7 @@ async function searchFromMarketplacePlugin(options, loader) {
         site: options.site,
         limit: options.limit
       },
-      {}
+      createStubContext("marketplace")
     );
     const items = extractItems(result);
     return items.map((item) => ({
@@ -9360,16 +9438,16 @@ async function handleBrowserCommand(command, args, options, sessionName, mode, c
     if (cmdDef) {
       if (mode === "json") {
         const paramsList = [];
-        const schema = cmdDef.parameters;
+        const schema = asZodSchema(cmdDef.parameters);
         const shape = schema?.shape ?? schema?._def?.shape;
         if (shape) {
           for (const [key, value] of Object.entries(shape)) {
-            const fieldSchema = value;
+            const fieldSchema = asZodSchema(value);
             const fieldDef = fieldSchema._def;
             const description = fieldSchema.description || fieldDef?.description || "";
             const typeName = fieldDef?.typeName || "";
             const isOptional = typeName === "ZodOptional" || typeof fieldSchema.isOptional === "function" && fieldSchema.isOptional();
-            const innerType = fieldDef?.innerType;
+            const innerType = asZodSchema(fieldDef?.innerType);
             const innerTypeName = innerType?._def ? innerType._def.typeName : typeName;
             let type = "unknown";
             if (innerTypeName === "ZodString" || typeName === "ZodString") type = "string";
@@ -9779,8 +9857,7 @@ async function buildRuntimePluginInfo() {
     const cmds = site.getAllCommands();
     const commandNames = cmds.map((c) => c.name);
     if (commandNames.length === 0) continue;
-    const anySite = site;
-    const hasLoginHandler = typeof anySite.hasLoginCommand === "function" && anySite.hasLoginCommand();
+    const hasLoginHandler = "hasLoginCommand" in site && typeof site.hasLoginCommand === "function" && site.hasLoginCommand();
     const configRequiresLogin = !!site.config.requiresLogin;
     const hasLogin = hasLoginHandler || configRequiresLogin;
     let loggedIn = null;
@@ -9830,7 +9907,7 @@ async function searchFromMarketplacePlugin2(options, loader) {
         site: options.site,
         limit: options.limit
       },
-      {}
+      createStubContext("marketplace")
     );
     const items = extractItems2(result);
     return items.map((item) => ({ ...item, source: "marketplace" }));
@@ -9845,7 +9922,7 @@ async function infoFromMarketplacePlugin(slug, loader) {
   const infoCmd = marketplaceSite.getCommand("info");
   if (!infoCmd) return null;
   try {
-    const result = await infoCmd.handler({ slug }, {});
+    const result = await infoCmd.handler({ slug }, createStubContext("marketplace"));
     if (!result || typeof result !== "object") return null;
     const r = result;
     let plugin = null;
@@ -9953,7 +10030,7 @@ async function handlePluginInfo(args, options, mode) {
     }
     console.error(`\u63D2\u4EF6 '${slug}' \u672A\u627E\u5230`);
   } catch (err) {
-    console.error("\u67E5\u8BE2\u5931\u8D25:", err.message);
+    console.error("\u67E5\u8BE2\u5931\u8D25:", errMsg(err));
   }
 }
 async function handlePluginSchema(args, mode) {
@@ -10644,9 +10721,9 @@ interface XBPage {
 }
 
 function ensurePage(ctx: CommandContext): XBPage {
-  const page = (ctx as Record<string, unknown>).page;
+  const page = 'page' in ctx ? (ctx as Record<string, unknown>).page : undefined;
   if (!page) throw new Error('No active page. Start a session first.');
-  return page as unknown as XBPage;
+  return page as XBPage;
 }
 
 export default createSite({
@@ -10679,7 +10756,7 @@ async function handleRun(filePath, options) {
   try {
     commands = readCommandFile(filePath);
   } catch (e) {
-    outputError(`Failed to read file '${filePath}': ${e.message}`);
+    outputError(`Failed to read file '${filePath}': ${errMsg(e)}`);
     return;
   }
   if (commands.length === 0) {
@@ -11035,7 +11112,7 @@ async function handleNetCommand(args, options, mode, sessionName) {
         outputError(`Unknown net sub-command: ${subCommand}. Use: list, clear, top, log, around, analyze, curl, replay, inspect, like, dislike, export`);
     }
   } catch (err) {
-    outputError(err.message || "Network command failed");
+    outputError(errMsg(err) || "Network command failed");
   }
 }
 
@@ -11560,7 +11637,7 @@ async function createSessionHandler(req) {
       createdAt: session.createdAt
     });
   } catch (err) {
-    return errorResponse(500, "INTERNAL_ERROR", err.message);
+    return errorResponse(500, "INTERNAL_ERROR", errMsg(err));
   }
 }
 async function closeSession2(req) {
@@ -11655,7 +11732,7 @@ async function route(method, url, headers, body) {
   try {
     return await match.route.handler(req);
   } catch (err) {
-    return errorResponse(500, "INTERNAL_ERROR", err.message);
+    return errorResponse(500, "INTERNAL_ERROR", errMsg(err));
   }
 }
 async function handleRequest(req, res, validateAuthFn) {
@@ -11813,8 +11890,9 @@ function showCommandHelp(siteName, cmd, siteConfig, mode) {
   if (mode === "json") {
     const paramsList = [];
     if (c.parameters) {
-      const def = c.parameters._def;
-      const shape = def.shape?.();
+      const def = asZodSchema(c.parameters)._def;
+      const rawShape = def?.shape;
+      const shape = typeof rawShape === "function" ? rawShape() : rawShape;
       if (shape) {
         for (const [key, value] of Object.entries(shape)) {
           const info = extractZodFieldInfo(value);
@@ -12041,16 +12119,16 @@ async function routeCommand(argv, stdinCommands) {
     if (builtinCmd) {
       if (mode === "json") {
         const paramsList = [];
-        const schema = builtinCmd.parameters;
+        const schema = asZodSchema(builtinCmd.parameters);
         const shape = schema?.shape ?? schema?._def?.shape;
         if (shape) {
           for (const [key, value] of Object.entries(shape)) {
-            const fieldSchema = value;
+            const fieldSchema = asZodSchema(value);
             const fieldDef = fieldSchema._def;
             const description = fieldSchema.description || fieldDef?.description || "";
             const typeName = fieldDef?.typeName || "";
             const isOptional = typeName === "ZodOptional" || typeof fieldSchema.isOptional === "function" && fieldSchema.isOptional();
-            const innerType = fieldDef?.innerType;
+            const innerType = asZodSchema(fieldDef?.innerType);
             const innerTypeName = innerType?._def ? innerType._def.typeName : typeName;
             let type = "unknown";
             if (innerTypeName === "ZodString" || typeName === "ZodString") type = "string";
@@ -12225,7 +12303,7 @@ Run "xbrowser ${command} --help" to see available commands.`
           const rawPluginArgs = subCmdIdx >= 0 ? argv.slice(subCmdIdx + 1) : [];
           const params = parsePluginParams(rawPluginArgs, cmdEntry.parameters);
           if (cmdEntry.parameters) {
-            const schemaAny = cmdEntry.parameters;
+            const schemaAny = asZodSchema(cmdEntry.parameters);
             const def = schemaAny._def;
             const shapeOrFn = def?.shape ?? schemaAny.shape;
             const shapeObj = typeof shapeOrFn === "function" ? shapeOrFn() : shapeOrFn;
@@ -12249,10 +12327,10 @@ Run "xbrowser ${command} ${subCommand} --help" to see available parameters.`
           }
           const needsBrowser = cmdEntry.scope === "page" || cmdEntry.scope === "browser";
           if (needsBrowser && !process.env.XBROWSER_DAEMON_WORKER) {
-            const { forwardExec } = await import("./daemon-client-UZZEHHIV.js");
+            const { forwardExec } = await import("./daemon-client-3JOKX2L2.js");
             const userTimeout = typeof params.timeout === "number" && params.timeout > 0 ? params.timeout * 1e3 + 3e4 : void 0;
             const result = await forwardExec(`${command}.${subCommand}`, params, sessionName, cdpEndpoint, userTimeout);
-            const resultData = result && typeof result === "object" ? result.data : void 0;
+            const resultData = result && typeof result === "object" && "data" in result ? result.data : void 0;
             if (result && result.success === false && resultData?.code === "LOGIN_REQUIRED") {
               outputLoginRequired(result, mode);
               return;
@@ -12301,7 +12379,7 @@ Run "xbrowser ${command} ${subCommand} --help" to see available parameters.`
             waitForHuman: async (_opts) => {
               return { solved: false, timedOut: true };
             },
-            tips: new TipCollector2()
+            tips: new TipCollector3()
           };
           try {
             const cmdStart = Date.now();
@@ -12555,7 +12633,7 @@ async function main() {
     const command = process.argv[2];
     const isLongRunning = command === "preview" || command === "serve";
     if (!isLongRunning) {
-      const { ensureProcessCanExit } = await import("./browser-R56O3CW6.js");
+      const { ensureProcessCanExit } = await import("./browser-5CTOA2WS.js");
       await ensureProcessCanExit().catch(() => {
       });
       process.exit(exitCode);

package/dist/{daemon-client-UZZEHHIV.js → daemon-client-3JOKX2L2.js}

@@ -29,7 +29,8 @@ import {
   forwardSessionList,
   forwardViewerCheckSelector,
   isDaemonRunning
-} from "./chunk-Q4IGYTKR.js";
+} from "./chunk-6WOSXSCQ.js";
+import "./chunk-GDKLH7ZY.js";
 import "./chunk-KFQGP6VL.js";
 export {
   daemonPing,

package/dist/{daemon-client-DRCUMNHK.js → daemon-client-DIEHGP5B.js}

@@ -1,6 +1,9 @@
 import {
   startDaemonProcess
 } from "./chunk-WJRE55TN.js";
+import {
+  errMsg
+} from "./chunk-GDKLH7ZY.js";
 import "./chunk-KFQGP6VL.js";
 
 // src/client/daemon-client.ts
@@ -91,7 +94,7 @@ async function forwardExec(command, params, session = "default", cdpEndpoint, ti
   try {
     return await rpcCall("exec", rpcParams, timeoutMs);
   } catch (e) {
-    return { success: false, data: null, message: e.message, duration: 0 };
+    return { success: false, data: null, message: errMsg(e), duration: 0 };
   }
 }
 async function forwardChain(input, session = "default", cdpEndpoint) {
@@ -100,7 +103,7 @@ async function forwardChain(input, session = "default", cdpEndpoint) {
   try {
     return await rpcCall("chain", params, 12e4);
   } catch (e) {
-    return { success: false, steps: [], totalDuration: 0, stoppedReason: e.message };
+    return { success: false, steps: [], totalDuration: 0, stoppedReason: errMsg(e) };
   }
 }
 async function forwardAgentObserve(session = "default", options) {