@xbrowser/cli 1.0.2 → 1.0.3

package/dist/daemon-main.js

@@ -21,14 +21,19 @@ import {
   resolveLaunchOpts,
   saveSessionDiskMeta,
   setActivePage
-} from "./chunk-QIK2I3VQ.js";
-import "./chunk-PPG4D2EW.js";
-import "./chunk-BBMRDUYQ.js";
+} from "./chunk-LRBSUKUZ.js";
+import "./chunk-N2JFPWMI.js";
+import "./chunk-TNEN6VQ2.js";
 import {
   getDaemonConfig,
   getDaemonProcessStatus
 } from "./chunk-WJRE55TN.js";
-import "./chunk-KFQGP6VL.js";
+import {
+  errMsg
+} from "./chunk-GDKLH7ZY.js";
+import {
+  __require
+} from "./chunk-KFQGP6VL.js";
 
 // src/daemon/daemon-main.ts
 import { writeFileSync as writeFileSync8, mkdirSync as mkdirSync7, appendFileSync } from "fs";
@@ -50,8 +55,8 @@ import {
   ok as ok25,
   fail as fail7,
   isCommandResult,
-  CompositeStorage,
-  TipCollector,
+  CompositeStorage as CompositeStorage2,
+  TipCollector as TipCollector2,
   normalizeTips as normalizeTips6,
   configureArchiveStore,
   appendCommandToArchive,
@@ -169,6 +174,51 @@ function parsePluginParams(args, schema, base = {}) {
   return result;
 }
 
+// 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;
+  }
+};
+
 // src/commands/navigation.ts
 import { z } from "zod";
 import { ok } from "@dyyz1993/xcli-core";
@@ -216,7 +266,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 };
@@ -1565,7 +1615,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"}`
             });
           }
         }
@@ -4664,7 +4714,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
@@ -4748,7 +4798,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 {
@@ -5683,11 +5733,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) {
@@ -6047,19 +6097,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
@@ -6753,15 +6810,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;
     }
   }
@@ -6793,11 +6849,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);
 }
@@ -6862,7 +6918,7 @@ async function executeCommand(commandName, params, sessionName = "default", extr
   }
   let targetPageOverride = null;
   if (_target && extraOpts?.cdpEndpoint) {
-    const { findTargetPage } = await import("./browser-GITRHHFO.js");
+    const { findTargetPage } = await import("./browser-ITLZZDHJ.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.`);
@@ -6879,7 +6935,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-DRCUMNHK.js");
+    const { forwardExec } = await import("./daemon-client-DIEHGP5B.js");
     const result = await forwardExec(commandName, params, sessionName, extraOpts?.cdpEndpoint);
     if (result) return result;
   }
@@ -6930,9 +6986,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) {
@@ -7045,7 +7101,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,
@@ -7158,7 +7214,7 @@ async function executeChain(input, options) {
             config: {},
             site,
             cliName: "xbrowser",
-            tips: new TipCollector()
+            tips: new TipCollector2()
           };
           const start2 = Date.now();
           try {
@@ -7245,7 +7301,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}`,
@@ -7555,7 +7611,7 @@ async function replayEntry(entry, options = {}) {
         size: 0,
         bodyMatch: false,
         duration: 0,
-        error: err.message
+        error: errMsg(err)
       }
     };
   }
@@ -7743,7 +7799,7 @@ var PlaybackEngine = class _PlaybackEngine {
     const content = fs2.readFileSync(filePath, "utf-8");
     const raw = filePath.endsWith(".json") ? JSON.parse(content) : yaml.parse(content);
     let recording;
-    const checkpoints = raw.checkpoints || [];
+    const checkpoints = "checkpoints" in raw ? raw.checkpoints : [];
     if (raw.events && raw.events.length > 0) {
       recording = raw;
     } else if (raw.actions && raw.actions.length > 0) {
@@ -7816,7 +7872,7 @@ var PlaybackEngine = class _PlaybackEngine {
         errors.push({
           eventIndex: i,
           event,
-          error: err.message
+          error: errMsg(err)
         });
         if (stopOnError) break;
       }
@@ -7880,7 +7936,7 @@ var PlaybackEngine = class _PlaybackEngine {
 // src/daemon/rpc-handlers.ts
 var activeRecorders = /* @__PURE__ */ new Map();
 var replayResumeResolvers = /* @__PURE__ */ new Map();
-var CONFIG_DIR2 = join7(homedir7(), ".xbrowser");
+var CONFIG_DIR3 = join7(homedir7(), ".xbrowser");
 var RECORDING_INJECT_JS = `
 (function(){
   if(window.__xb_rec) return;
@@ -8237,19 +8293,27 @@ function createRPCHandler() {
     const analyzed = enrichEntries(scored);
     return { session: sessionName, total: entries.length, analyzed };
   }
+  function extractCurlOptions(params) {
+    return {
+      includeHeaders: params.includeHeaders,
+      includeBody: params.includeBody,
+      compressed: params.compressed,
+      insecure: params.insecure
+    };
+  }
   function handleNetworkCurl(params) {
     const sessionName = params.session || "default";
     const id = params.id;
     const entry = networkStore.inspect(sessionName, id);
     if (!entry.capture) return { error: `Entry #${id} not found` };
-    return generateCurl(entry.capture, params);
+    return generateCurl(entry.capture, extractCurlOptions(params));
   }
   async function handleNetworkReplay(params) {
     const sessionName = params.session || "default";
     const id = params.id;
     const entry = networkStore.inspect(sessionName, id);
     if (!entry.capture) return { error: `Entry #${id} not found` };
-    return await replayEntry(entry.capture, params);
+    return await replayEntry(entry.capture, extractCurlOptions(params));
   }
   function handleNetworkLike(params) {
     const sessionName = params.session || "default";
@@ -8320,7 +8384,7 @@ function createRPCHandler() {
     if (!sess) return { ok: false, error: "No session" };
     try {
       const events = await sess.page.evaluate(() => window.__xb_evts || []);
-      const recordingsDir = join7(CONFIG_DIR2, "recordings");
+      const recordingsDir = join7(CONFIG_DIR3, "recordings");
       mkdirSync6(recordingsDir, { recursive: true });
       const outPath = params.path || join7(recordingsDir, `recording-${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}.json`);
       writeFileSync7(outPath, JSON.stringify({
@@ -8330,7 +8394,7 @@ function createRPCHandler() {
       }, null, 2));
       return { ok: true, path: outPath, events: events.length };
     } catch (e) {
-      return { ok: false, error: e.message };
+      return { ok: false, error: errMsg(e) };
     }
   }
   function handleCommandLog(params) {
@@ -8363,9 +8427,8 @@ function createRPCHandler() {
         if (session?.page) {
           element = await session.page.evaluate((sel) => {
             const el = document.querySelector(sel);
-            const w = window;
-            if (!el || typeof w.__xb_describe !== "function") return null;
-            return w.__xb_describe(el);
+            if (!el || typeof window.__xb_describe !== "function") return null;
+            return window.__xb_describe(el);
           }, selector);
         }
       } catch {
@@ -8410,7 +8473,7 @@ function createRPCHandler() {
           cdpEndpoint: session.cdpEndpoint
         });
       } catch (e) {
-        return { ok: false, error: "Failed to auto-create session: " + e.message };
+        return { ok: false, error: "Failed to auto-create session: " + errMsg(e) };
       }
     }
     try {
@@ -8419,7 +8482,7 @@ function createRPCHandler() {
       activeRecorders.set(sessionName, recorder);
       return { ok: true, session: sessionName, startUrl: url || session.page.url() };
     } catch (e) {
-      return { ok: false, error: e.message };
+      return { ok: false, error: errMsg(e) };
     }
   }
   async function handleRecordStop(params) {
@@ -8451,7 +8514,7 @@ function createRPCHandler() {
       };
     } catch (e) {
       activeRecorders.delete(sessionName);
-      return { ok: false, error: e.message };
+      return { ok: false, error: errMsg(e) };
     }
   }
   function handleRecordStatus(params) {
@@ -8519,14 +8582,14 @@ function createRPCHandler() {
     const sessionName = params.session || "default";
     const slowMo = params.slowMo || 1;
     if (!file) {
-      return { ok: false, success: false, duration: 0, eventsPlayed: 0, totalEvents: 0, errors: [{ eventIndex: -1, event: {}, error: "Missing file parameter" }] };
+      return { ok: false, success: false, duration: 0, eventsPlayed: 0, totalEvents: 0, errors: [{ eventIndex: -1, error: "Missing file parameter" }] };
     }
     const session = findSession(sessionName);
     if (!session) {
-      return { ok: false, success: false, duration: 0, eventsPlayed: 0, totalEvents: 0, errors: [{ eventIndex: -1, event: {}, error: "Session not found: " + sessionName }] };
+      return { ok: false, success: false, duration: 0, eventsPlayed: 0, totalEvents: 0, errors: [{ eventIndex: -1, error: "Session not found: " + sessionName }] };
     }
     if (!session.page) {
-      return { ok: false, success: false, duration: 0, eventsPlayed: 0, totalEvents: 0, errors: [{ eventIndex: -1, event: {}, error: "Session has no page: " + sessionName }] };
+      return { ok: false, success: false, duration: 0, eventsPlayed: 0, totalEvents: 0, errors: [{ eventIndex: -1, error: "Session has no page: " + sessionName }] };
     }
     let rawContent;
     let parsed;
@@ -8534,12 +8597,12 @@ function createRPCHandler() {
       rawContent = readFileSync6(file, "utf8");
       parsed = JSON.parse(rawContent);
     } catch (e) {
-      return { ok: false, success: false, duration: 0, eventsPlayed: 0, totalEvents: 0, errors: [{ eventIndex: -1, event: {}, error: "Failed to read/parse file: " + String(e) }] };
+      return { ok: false, success: false, duration: 0, eventsPlayed: 0, totalEvents: 0, errors: [{ eventIndex: -1, error: "Failed to read/parse file: " + String(e) }] };
     }
     const isNewFormat = Array.isArray(parsed.actions);
     if (isNewFormat) {
       try {
-        const { SessionReplayer } = await import("./session-replayer-GLTUICSD.js");
+        const { SessionReplayer } = await import("./session-replayer-MY27H4DX.js");
         const replayer = new SessionReplayer({
           page: session.page,
           stepDelay: slowMo * 500,
@@ -8550,6 +8613,9 @@ function createRPCHandler() {
             console.error(`[replay] Error at step ${action.type}: ${error.message}`);
           }
         });
+        if (!Array.isArray(parsed.actions) || typeof parsed.startUrl !== "string") {
+          return { ok: false, success: false, duration: 0, eventsPlayed: 0, totalEvents: 0, errors: [{ eventIndex: -1, error: "Invalid recording format: missing actions or startUrl" }] };
+        }
         await replayer.load(parsed);
         const startTime = Date.now();
         const result2 = await replayer.run();
@@ -8565,7 +8631,7 @@ function createRPCHandler() {
       } catch (e) {
         const msg = e instanceof Error ? e.message : String(e);
         console.error("[replay] SessionReplayer error:", msg);
-        return { ok: false, success: false, duration: 0, eventsPlayed: 0, totalEvents: 0, errors: [{ eventIndex: -1, event: {}, error: "Replay failed: " + msg }] };
+        return { ok: false, success: false, duration: 0, eventsPlayed: 0, totalEvents: 0, errors: [{ eventIndex: -1, error: "Replay failed: " + msg }] };
       }
     }
     const engine = PlaybackEngine.fromFile(session.page, file);
@@ -9117,14 +9183,13 @@ var ElementMonitor = class {
       document.addEventListener("focusin", (e) => {
         const el = e.target;
         if (el.tagName === "INPUT" || el.tagName === "TEXTAREA" || el.contentEditable === "true") {
-          const w = window;
-          w.__xb_focus_seq = (w.__xb_focus_seq || 0) + 1;
+          window.__xb_focus_seq = (window.__xb_focus_seq || 0) + 1;
           const info = {
             selector: "",
             tag: el.tagName,
             value: el.value || "",
             placeholder: el.placeholder || "",
-            seq: w.__xb_focus_seq
+            seq: window.__xb_focus_seq
           };
           if (el.id) info.selector = "#" + el.id;
           else if (el.getAttribute("name")) info.selector = '[name="' + el.getAttribute("name") + '"]';
@@ -9132,7 +9197,7 @@ var ElementMonitor = class {
           if (el.tagName === "INPUT" && el.type === "file") {
             info.isFileInput = true;
           }
-          w.__xb_last_focused = info;
+          window.__xb_last_focused = info;
         }
       }, true);
       document.addEventListener("focusout", () => {
@@ -11305,8 +11370,8 @@ connectWS();
 }
 
 // src/daemon/daemon-main.ts
-var CONFIG_DIR3 = join8(homedir8(), ".xbrowser");
-var LOG_FILE = join8(CONFIG_DIR3, "daemon.log");
+var CONFIG_DIR4 = join8(homedir8(), ".xbrowser");
+var LOG_FILE = join8(CONFIG_DIR4, "daemon.log");
 function log(msg) {
   const ts = (/* @__PURE__ */ new Date()).toISOString().replace("T", " ").substring(0, 19);
   const line = `[DAEMON ${ts}] ${msg}
@@ -11360,8 +11425,8 @@ async function main() {
   rpcHandler.setPreviewWS(previewWS);
   previewWS.on("screencast-started", (sid) => log(`Preview screencast started: ${sid}`));
   previewWS.on("screencast-stopped", (sid) => log(`Preview screencast stopped: ${sid}`));
-  mkdirSync7(CONFIG_DIR3, { recursive: true });
-  writeFileSync8(join8(CONFIG_DIR3, "daemon.json"), JSON.stringify({
+  mkdirSync7(CONFIG_DIR4, { recursive: true });
+  writeFileSync8(join8(CONFIG_DIR4, "daemon.json"), JSON.stringify({
     port: daemonPort,
     pid: process.pid,
     startedAt: Date.now()

package/dist/index.d.ts

@@ -1928,7 +1928,7 @@ interface PlaybackResult {
     totalEvents: number;
     errors: Array<{
         eventIndex: number;
-        event: RecordedEvent;
+        event?: RecordedEvent;
         error: string;
     }>;
 }