@xbrowser/cli 0.15.0 → 0.16.0

package/dist/cli.js

@@ -174,7 +174,8 @@ import {
   isCommandResult,
   configureArchiveStore,
   appendCommandToArchive,
-  checkGuard
+  checkGuard,
+  PluginStorage
 } from "@dyyz1993/xcli-core";
 
 // src/commands/navigation.ts
@@ -5652,7 +5653,7 @@ import { join as join2 } from "path";
 import { execSync as execSync6 } from "child_process";
 var SHARED_PLUGIN_DEPENDENCIES = {
   "zod": "^3.24.0",
-  "@dyyz1993/xcli-core": "^0.9.2"
+  "@dyyz1993/xcli-core": "^0.12.1"
 };
 function ensurePluginDependencies(pluginsDir) {
   const zodPath = join2(pluginsDir, "node_modules", "zod");
@@ -6236,45 +6237,13 @@ async function loadHooks() {
 // src/executor.ts
 import { homedir as homedir3 } from "os";
 import { join as join3 } from "path";
-import { existsSync as existsSync6, readFileSync as readFileSync10, writeFileSync as writeFileSync5, mkdirSync as mkdirSync3 } from "fs";
 var NAVIGATION_COMMANDS = /* @__PURE__ */ new Set(["goto", "back", "forward", "refresh"]);
 var snapshotHintShown = /* @__PURE__ */ new WeakSet();
 var STORAGE_DIR = join3(homedir3(), ".xbrowser", "storage");
 var storageCache = /* @__PURE__ */ new Map();
 function getPluginStorage(pluginName) {
   if (!storageCache.has(pluginName)) {
-    const filePath = join3(STORAGE_DIR, `${pluginName}.json`);
-    let data = {};
-    const load3 = () => {
-      if (existsSync6(filePath)) {
-        try {
-          data = JSON.parse(readFileSync10(filePath, "utf-8"));
-        } catch {
-          data = {};
-        }
-      }
-    };
-    const save = () => {
-      mkdirSync3(STORAGE_DIR, { recursive: true });
-      writeFileSync5(filePath, JSON.stringify(data, null, 2), "utf-8");
-    };
-    load3();
-    storageCache.set(pluginName, {
-      get: async (key) => data[key] ?? null,
-      set: async (key, value) => {
-        data[key] = value;
-        save();
-      },
-      delete: async (key) => {
-        delete data[key];
-        save();
-      },
-      clear: async () => {
-        data = {};
-        save();
-      },
-      keys: async () => Object.keys(data)
-    });
+    storageCache.set(pluginName, new PluginStorage(pluginName, STORAGE_DIR));
   }
   return storageCache.get(pluginName);
 }
@@ -6371,6 +6340,10 @@ async function executeCommand(commandName, params, sessionName = "default", extr
     session = await createSession(sessionName, params.url, {
       cdpEndpoint: extraOpts?.cdpEndpoint
     });
+  } else if (command.scope === "browser") {
+    session = await createSession(sessionName, void 0, {
+      cdpEndpoint: extraOpts?.cdpEndpoint
+    });
   } else if (command.scope !== "project") {
     return errorResult(
       `Session '${sessionName}' not found. Run "xbrowser session open <url>" first.`
@@ -6901,7 +6874,7 @@ var sessionKillBuiltin = {
 };
 
 // src/config.ts
-import { existsSync as existsSync7, mkdirSync as mkdirSync4, writeFileSync as writeFileSync6 } from "fs";
+import { existsSync as existsSync6, mkdirSync as mkdirSync3, writeFileSync as writeFileSync5 } from "fs";
 import { join as join4 } from "path";
 import { homedir as homedir4, tmpdir } from "os";
 function getConfigFile() {
@@ -6909,14 +6882,14 @@ function getConfigFile() {
 }
 function loadConfig() {
   const configFile = getConfigFile();
-  if (!existsSync7(configFile)) return {};
+  if (!existsSync6(configFile)) return {};
   return readJsonFile(configFile, {});
 }
 function saveConfig(config) {
   const dir = join4(homedir4() || tmpdir(), ".xbrowser");
   const configFile = getConfigFile();
-  if (!existsSync7(dir)) mkdirSync4(dir, { recursive: true });
-  writeFileSync6(configFile, JSON.stringify(config, null, 2), "utf-8");
+  if (!existsSync6(dir)) mkdirSync3(dir, { recursive: true });
+  writeFileSync5(configFile, JSON.stringify(config, null, 2), "utf-8");
 }
 function getConfigValue(key) {
   return loadConfig()[key];
@@ -7024,26 +6997,26 @@ var configBuiltin = {
 
 // src/plugin/installer.ts
 import {
-  existsSync as existsSync14,
+  existsSync as existsSync13,
   readdirSync as readdirSync3,
-  mkdirSync as mkdirSync9,
+  mkdirSync as mkdirSync8,
   rmSync as rmSync7
 } from "fs";
 import { resolve as resolve15, basename as basename2 } from "path";
 import { homedir as homedir5 } from "os";
 
 // src/plugin/install-sources/local.ts
-import { existsSync as existsSync9, cpSync as cpSync2, rmSync as rmSync2 } from "fs";
+import { existsSync as existsSync8, cpSync as cpSync2, rmSync as rmSync2 } from "fs";
 import { resolve as resolve10 } from "path";
 
 // src/plugin/install-utils.ts
 import {
-  existsSync as existsSync8,
+  existsSync as existsSync7,
   readdirSync as readdirSync2,
   cpSync,
   rmSync,
-  mkdirSync as mkdirSync5,
-  readFileSync as readFileSync11,
+  mkdirSync as mkdirSync4,
+  readFileSync as readFileSync10,
   createWriteStream
 } from "fs";
 import { resolve as resolve9 } from "path";
@@ -7114,7 +7087,7 @@ async function downloadToFile(url, destPath) {
   await pipeline(nodeStream, createWriteStream(destPath));
 }
 function extractTarGz(tarballPath, targetDir) {
-  mkdirSync5(targetDir, { recursive: true });
+  mkdirSync4(targetDir, { recursive: true });
   execSync7(`tar -xzf "${tarballPath}" -C "${targetDir}"`, { stdio: "pipe" });
 }
 function flattenPackageRoot(targetDir) {
@@ -7135,18 +7108,18 @@ function flattenPackageRoot(targetDir) {
 async function verifyPlugin(dir) {
   const warnings = [];
   const indexPath = resolve9(dir, "index.ts");
-  if (!existsSync8(indexPath)) {
+  if (!existsSync7(indexPath)) {
     const indexJs = resolve9(dir, "index.js");
-    if (!existsSync8(indexJs)) {
+    if (!existsSync7(indexJs)) {
       return { valid: false, error: "No index.ts or index.js entry point found", warnings };
     }
   }
   const pkgPath = resolve9(dir, "package.json");
-  if (!existsSync8(pkgPath)) {
+  if (!existsSync7(pkgPath)) {
     warnings.push("No package.json found");
   } else {
     try {
-      const pkg2 = JSON.parse(readFileSync11(pkgPath, "utf-8"));
+      const pkg2 = JSON.parse(readFileSync10(pkgPath, "utf-8"));
       if (!pkg2.xbrowser) {
         warnings.push("No xbrowser metadata in package.json");
       }
@@ -7166,7 +7139,7 @@ function safeCleanup(dir) {
 // src/plugin/install-sources/local.ts
 async function installFromLocal(source, name, targetDir) {
   const srcPath = resolve10(source);
-  if (!existsSync9(srcPath)) {
+  if (!existsSync8(srcPath)) {
     throw new Error(`Local path does not exist: ${srcPath}`);
   }
   const tmpTarget = `${targetDir}-tmp-${Date.now()}`;
@@ -7179,7 +7152,7 @@ async function installFromLocal(source, name, targetDir) {
       safeCleanup(tmpTarget);
       throw new Error(`Invalid plugin: ${verify.error}`);
     }
-    if (existsSync9(targetDir)) {
+    if (existsSync8(targetDir)) {
       rmSync2(targetDir, { recursive: true, force: true });
     }
     cpSync2(tmpTarget, targetDir, { recursive: true, force: true });
@@ -7199,7 +7172,7 @@ async function installFromLocal(source, name, targetDir) {
 }
 
 // src/plugin/install-sources/npm.ts
-import { existsSync as existsSync10, mkdirSync as mkdirSync6, readFileSync as readFileSync12, writeFileSync as writeFileSync7, rmSync as rmSync3, cpSync as cpSync3 } from "fs";
+import { existsSync as existsSync9, mkdirSync as mkdirSync5, readFileSync as readFileSync11, writeFileSync as writeFileSync6, rmSync as rmSync3, cpSync as cpSync3 } from "fs";
 import { resolve as resolve11, join as join5 } from "path";
 import { tmpdir as tmpdir2 } from "os";
 async function installFromNpm(packageName, name, targetDir) {
@@ -7220,7 +7193,7 @@ async function installFromNpm(packageName, name, targetDir) {
   }
   const tarballUrl = versionMeta.dist.tarball;
   const tmpDir = join5(tmpdir2(), `xbrowser-npm-${Date.now()}`);
-  mkdirSync6(tmpDir, { recursive: true });
+  mkdirSync5(tmpDir, { recursive: true });
   let warnings = [];
   try {
     const tarballPath = join5(tmpDir, `${name}.tgz`);
@@ -7233,16 +7206,16 @@ async function installFromNpm(packageName, name, targetDir) {
     if (!verify.valid) {
       throw new Error(`Invalid npm plugin: ${verify.error}`);
     }
-    if (existsSync10(targetDir)) {
+    if (existsSync9(targetDir)) {
       rmSync3(targetDir, { recursive: true, force: true });
     }
     cpSync3(extractDir, targetDir, { recursive: true, force: true });
     const pkgPath = resolve11(targetDir, "package.json");
-    if (existsSync10(pkgPath)) {
-      const pkg2 = JSON.parse(readFileSync12(pkgPath, "utf-8"));
+    if (existsSync9(pkgPath)) {
+      const pkg2 = JSON.parse(readFileSync11(pkgPath, "utf-8"));
       if (!pkg2._npmSource) {
         pkg2._npmSource = { name: packageName, version: latestVersion };
-        writeFileSync7(pkgPath, JSON.stringify(pkg2, null, 2));
+        writeFileSync6(pkgPath, JSON.stringify(pkg2, null, 2));
       }
     }
   } finally {
@@ -7259,7 +7232,7 @@ async function installFromNpm(packageName, name, targetDir) {
 }
 
 // src/plugin/install-sources/git.ts
-import { existsSync as existsSync11, readFileSync as readFileSync13, writeFileSync as writeFileSync8, rmSync as rmSync4, cpSync as cpSync4 } from "fs";
+import { existsSync as existsSync10, readFileSync as readFileSync12, writeFileSync as writeFileSync7, rmSync as rmSync4, cpSync as cpSync4 } from "fs";
 import { resolve as resolve12, join as join6 } from "path";
 import { tmpdir as tmpdir3 } from "os";
 import { execSync as execSync8 } from "child_process";
@@ -7273,17 +7246,17 @@ async function installFromGit(gitUrl, name, targetDir) {
     if (!verify.valid) {
       throw new Error(`Invalid git plugin: ${verify.error}`);
     }
-    if (existsSync11(targetDir)) {
+    if (existsSync10(targetDir)) {
       rmSync4(targetDir, { recursive: true, force: true });
     }
     cpSync4(tmpDir, targetDir, { recursive: true, force: true });
     rmSync4(resolve12(targetDir, ".git"), { recursive: true, force: true });
     const pkgPath = resolve12(targetDir, "package.json");
-    if (existsSync11(pkgPath)) {
-      const pkg2 = JSON.parse(readFileSync13(pkgPath, "utf-8"));
+    if (existsSync10(pkgPath)) {
+      const pkg2 = JSON.parse(readFileSync12(pkgPath, "utf-8"));
       if (!pkg2._gitSource) {
         pkg2._gitSource = { url: gitUrl };
-        writeFileSync8(pkgPath, JSON.stringify(pkg2, null, 2));
+        writeFileSync7(pkgPath, JSON.stringify(pkg2, null, 2));
       }
     }
   } finally {
@@ -7300,12 +7273,12 @@ async function installFromGit(gitUrl, name, targetDir) {
 }
 
 // src/plugin/install-sources/url.ts
-import { existsSync as existsSync12, readFileSync as readFileSync14, writeFileSync as writeFileSync9, mkdirSync as mkdirSync7, rmSync as rmSync5, cpSync as cpSync5 } from "fs";
+import { existsSync as existsSync11, readFileSync as readFileSync13, writeFileSync as writeFileSync8, mkdirSync as mkdirSync6, rmSync as rmSync5, cpSync as cpSync5 } from "fs";
 import { resolve as resolve13, join as join7, basename } from "path";
 import { tmpdir as tmpdir4 } from "os";
 async function installFromUrl(url, name, targetDir) {
   const tmpDir = join7(tmpdir4(), `xbrowser-url-${Date.now()}`);
-  mkdirSync7(tmpDir, { recursive: true });
+  mkdirSync6(tmpDir, { recursive: true });
   let warnings = [];
   try {
     const fileName = basename(new URL(url).pathname) || "plugin.tar.gz";
@@ -7319,16 +7292,16 @@ async function installFromUrl(url, name, targetDir) {
     if (!verify.valid) {
       throw new Error(`Invalid plugin from URL: ${verify.error}`);
     }
-    if (existsSync12(targetDir)) {
+    if (existsSync11(targetDir)) {
       rmSync5(targetDir, { recursive: true, force: true });
     }
     cpSync5(extractDir, targetDir, { recursive: true, force: true });
     const pkgPath = resolve13(targetDir, "package.json");
-    if (existsSync12(pkgPath)) {
-      const pkg2 = JSON.parse(readFileSync14(pkgPath, "utf-8"));
+    if (existsSync11(pkgPath)) {
+      const pkg2 = JSON.parse(readFileSync13(pkgPath, "utf-8"));
       if (!pkg2._urlSource) {
         pkg2._urlSource = { url };
-        writeFileSync9(pkgPath, JSON.stringify(pkg2, null, 2));
+        writeFileSync8(pkgPath, JSON.stringify(pkg2, null, 2));
       }
     }
   } finally {
@@ -7346,10 +7319,10 @@ async function installFromUrl(url, name, targetDir) {
 
 // src/plugin/install-sources/marketplace.ts
 import {
-  existsSync as existsSync13,
-  mkdirSync as mkdirSync8,
-  writeFileSync as writeFileSync10,
-  readFileSync as readFileSync15,
+  existsSync as existsSync12,
+  mkdirSync as mkdirSync7,
+  writeFileSync as writeFileSync9,
+  readFileSync as readFileSync14,
   rmSync as rmSync6,
   cpSync as cpSync6
 } from "fs";
@@ -7371,12 +7344,12 @@ async function installFromMarketplace(pluginsDir, slug, options) {
   const plugin = detailData.data;
   const name = options?.name || String(plugin.slug || slug);
   const targetDir = resolve14(pluginsDir, name);
-  if (existsSync13(targetDir) && !options?.force) {
+  if (existsSync12(targetDir) && !options?.force) {
     throw new Error(`Plugin "${name}" already exists. Use --force to overwrite.`);
   }
-  mkdirSync8(targetDir, { recursive: true });
+  mkdirSync7(targetDir, { recursive: true });
   const tmpDir = join8(tmpdir5(), `xbrowser-marketplace-${Date.now()}`);
-  mkdirSync8(tmpDir, { recursive: true });
+  mkdirSync7(tmpDir, { recursive: true });
   const realSlug = String(plugin.slug || slug);
   try {
     await downloadAndExtractMarketplaceTarball(baseUrl, realSlug, tmpDir, targetDir);
@@ -7406,14 +7379,14 @@ function isManifestArray(data) {
   return Array.isArray(data) && data.length > 0 && typeof data[0].path === "string" && typeof data[0].content === "string";
 }
 function extractManifestToDir(manifest, targetDir) {
-  if (existsSync13(targetDir)) {
+  if (existsSync12(targetDir)) {
     rmSync6(targetDir, { recursive: true, force: true });
   }
-  mkdirSync8(targetDir, { recursive: true });
+  mkdirSync7(targetDir, { recursive: true });
   for (const file of manifest) {
     const filePath = resolve14(targetDir, file.path);
-    mkdirSync8(dirname2(filePath), { recursive: true });
-    writeFileSync10(filePath, Buffer.from(file.content, "base64"));
+    mkdirSync7(dirname2(filePath), { recursive: true });
+    writeFileSync9(filePath, Buffer.from(file.content, "base64"));
   }
 }
 function tryParseAsGzippedManifest(buffer) {
@@ -7440,7 +7413,7 @@ async function downloadAndExtractMarketplaceTarball(baseUrl, slug, tmpDir, targe
     const redirectUrl = tarballRes.headers.get("location");
     const tarballPath = join8(tmpDir, `${slug}.tar.gz`);
     await downloadToFile(redirectUrl, tarballPath);
-    const buffer = readFileSync15(tarballPath);
+    const buffer = readFileSync14(tarballPath);
     const manifest = tryParseAsGzippedManifest(buffer);
     if (manifest) {
       extractManifestToDir(manifest, targetDir);
@@ -7449,7 +7422,7 @@ async function downloadAndExtractMarketplaceTarball(baseUrl, slug, tmpDir, targe
     const extractDir = join8(tmpDir, "extracted");
     extractTarGz(tarballPath, extractDir);
     flattenPackageRoot(extractDir);
-    if (existsSync13(targetDir)) {
+    if (existsSync12(targetDir)) {
       rmSync6(targetDir, { recursive: true, force: true });
     }
     cpSync6(extractDir, targetDir, { recursive: true, force: true });
@@ -7461,12 +7434,12 @@ async function downloadAndExtractMarketplaceTarball(baseUrl, slug, tmpDir, targe
       return;
     }
     const tarballPath = join8(tmpDir, `${slug}.tar.gz`);
-    writeFileSync10(tarballPath, buffer);
+    writeFileSync9(tarballPath, buffer);
     try {
       const extractDir = join8(tmpDir, "extracted");
       extractTarGz(tarballPath, extractDir);
       flattenPackageRoot(extractDir);
-      if (existsSync13(targetDir)) {
+      if (existsSync12(targetDir)) {
         rmSync6(targetDir, { recursive: true, force: true });
       }
       cpSync6(extractDir, targetDir, { recursive: true, force: true });
@@ -7502,24 +7475,24 @@ function writeMarketplacePackageJson(plugin, slug, name, baseUrl, targetDir) {
     }
   };
   const pkgPath = resolve14(targetDir, "package.json");
-  if (!existsSync13(pkgPath)) {
-    writeFileSync10(pkgPath, JSON.stringify(packageJson, null, 2));
+  if (!existsSync12(pkgPath)) {
+    writeFileSync9(pkgPath, JSON.stringify(packageJson, null, 2));
   } else {
     try {
-      const existing = JSON.parse(readFileSync15(pkgPath, "utf-8"));
+      const existing = JSON.parse(readFileSync14(pkgPath, "utf-8"));
       const merged = {
         ...existing,
         xbrowser: { ...existing.xbrowser, ...packageJson.xbrowser },
         _marketplace: packageJson._marketplace
       };
-      writeFileSync10(pkgPath, JSON.stringify(merged, null, 2));
+      writeFileSync9(pkgPath, JSON.stringify(merged, null, 2));
     } catch {
-      writeFileSync10(pkgPath, JSON.stringify(packageJson, null, 2));
+      writeFileSync9(pkgPath, JSON.stringify(packageJson, null, 2));
     }
   }
 }
 function ensureIndexFile(plugin, name, targetDir) {
-  if (!existsSync13(resolve14(targetDir, "index.ts")) && !existsSync13(resolve14(targetDir, "index.js"))) {
+  if (!existsSync12(resolve14(targetDir, "index.ts")) && !existsSync12(resolve14(targetDir, "index.js"))) {
     const commands = plugin.commands || [];
     const commandHandlers = commands.length > 0 ? commands.map((cmd) => {
       return [
@@ -7534,7 +7507,7 @@ function ensureIndexFile(plugin, name, targetDir) {
       `    handler: async () => ({ data: { message: 'Hello from ${name}!' }, tips: [] }),`,
       `  });`
     ].join("\n");
-    writeFileSync10(
+    writeFileSync9(
       resolve14(targetDir, "index.ts"),
       [
         `import type { XCLIAPI } from '@dyyz1993/xcli-core';`,
@@ -7573,10 +7546,10 @@ var PluginInstaller = class {
     const type = this.detectSourceType(source);
     const name = options?.name || this.deriveName(source, type);
     const targetDir = resolve15(this.pluginsDir, name);
-    if (existsSync14(targetDir) && !options?.force) {
+    if (existsSync13(targetDir) && !options?.force) {
       throw new Error(`Plugin "${name}" already exists. Use --force to overwrite.`);
     }
-    mkdirSync9(targetDir, { recursive: true });
+    mkdirSync8(targetDir, { recursive: true });
     const resolvedSource = type === "npm" ? await resolveNpmPackageWithFallback(source) : source;
     switch (type) {
       case "local":
@@ -7634,7 +7607,7 @@ var PluginInstaller = class {
    */
   async uninstall(name) {
     const targetDir = resolve15(this.pluginsDir, name);
-    if (!existsSync14(targetDir)) {
+    if (!existsSync13(targetDir)) {
       throw new Error(`Plugin "${name}" not found`);
     }
     rmSync7(targetDir, { recursive: true, force: true });
@@ -7645,7 +7618,7 @@ var PluginInstaller = class {
    * @returns Array of installed plugin information.
    */
   async list(_options) {
-    if (!existsSync14(this.pluginsDir)) return [];
+    if (!existsSync13(this.pluginsDir)) return [];
     const entries = readdirSync3(this.pluginsDir, { withFileTypes: true });
     const plugins = [];
     for (const entry of entries) {
@@ -7653,7 +7626,7 @@ var PluginInstaller = class {
       const pluginPath = resolve15(this.pluginsDir, entry.name);
       const indexPath = resolve15(pluginPath, "index.ts");
       const indexJsPath = resolve15(pluginPath, "index.js");
-      if (!existsSync14(indexPath) && !existsSync14(indexJsPath)) continue;
+      if (!existsSync13(indexPath) && !existsSync13(indexJsPath)) continue;
       const metadata = PluginMetadataParser.parseFromPackageJson(pluginPath);
       let source = "local";
       const pkg2 = readJsonFile(resolve15(pluginPath, "package.json"), {});
@@ -7680,10 +7653,10 @@ var PluginInstaller = class {
     }
     if (source.startsWith("file://")) {
       const filePath = decodeURIComponent(new URL(source).pathname);
-      if (existsSync14(filePath)) return "url";
+      if (existsSync13(filePath)) return "url";
     }
     if (source.endsWith(".git") || source.includes("github.com/")) return "git";
-    if (existsSync14(resolve15(source))) return "local";
+    if (existsSync13(resolve15(source))) return "local";
     return "npm";
   }
   deriveName(source, type) {
@@ -9707,7 +9680,7 @@ async function handleFilter(args, _mode) {
 
 // src/stdin.ts
 import { createInterface } from "readline";
-import { readFileSync as readFileSync16 } from "fs";
+import { readFileSync as readFileSync15 } from "fs";
 async function readStdin2() {
   if (process.stdin.isTTY) return [];
   const lines = [];
@@ -9721,7 +9694,7 @@ async function readStdin2() {
   return lines;
 }
 function readCommandFile(filePath) {
-  const content = readFileSync16(filePath, "utf-8");
+  const content = readFileSync15(filePath, "utf-8");
   return content.split("\n").map((line) => line.trim()).filter((line) => line && !line.startsWith("#"));
 }
 
@@ -10618,6 +10591,22 @@ var HTTPServer = class {
 };
 
 // src/router.ts
+var KNOWN_GLOBAL_OPTIONS = /* @__PURE__ */ new Set([
+  "json",
+  "yaml",
+  "session",
+  "cdp",
+  "cdp-endpoint",
+  "version",
+  "v",
+  "help",
+  "h",
+  "target",
+  "port",
+  "token",
+  "timeout",
+  "headless"
+]);
 function showCommandHelp(siteName, cmd, siteConfig, mode) {
   const c = cmd;
   if (mode === "json") {
@@ -10742,8 +10731,23 @@ async function handleEvalMode(argv) {
 }
 async function handleChainInput(input, argv) {
   const cdpEndpoint = argv ? extractCdpFromArgv(argv) : void 0;
+  const jsonMode = argv ? argv.includes("--json") || argv.includes("-j") : false;
   const chainResult = await executeChain(input, { cdpEndpoint });
-  printChainResult(chainResult);
+  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));
+  } else {
+    printChainResult(chainResult);
+  }
   if (!chainResult.success) throw new Error("Command failed");
 }
 async function routeCommand(argv, stdinCommands) {
@@ -10766,6 +10770,8 @@ async function routeCommand(argv, stdinCommands) {
   }
   const parsed = parseArgs(argv);
   const { positional, options } = parsed;
+  const command = positional[0];
+  const cmdArgs = positional.slice(1);
   const mode = options.json ? "json" : options.yaml ? "yaml" : "text";
   const sessionName = options.session || process.env.XBROWSER_SESSION || "default";
   const cdpEndpoint = options.cdp;
@@ -10777,8 +10783,6 @@ async function routeCommand(argv, stdinCommands) {
     showMainHelp();
     return;
   }
-  const command = positional[0];
-  const cmdArgs = positional.slice(1);
   if ((options.help || options.h) && positional.length > 0) {
     const loader = await getPluginLoader();
     const internalLoader = loader.getCore().loader;
@@ -10993,10 +10997,30 @@ Run "xbrowser ${command} --help" to see available commands.`
           const subCmdIdx = pluginNameIdx >= 0 ? argv.indexOf(subCommand, pluginNameIdx + 1) : -1;
           const rawPluginArgs = subCmdIdx >= 0 ? argv.slice(subCmdIdx + 1) : [];
           const params = parsePluginParams(rawPluginArgs, cmdEntry.parameters);
+          if (cmdEntry.parameters) {
+            const schemaAny = cmdEntry.parameters;
+            const def = schemaAny._def;
+            const shapeOrFn = def?.shape ?? schemaAny.shape;
+            const shapeObj = typeof shapeOrFn === "function" ? shapeOrFn() : shapeOrFn;
+            if (shapeObj && typeof shapeObj === "object") {
+              const knownKeys = new Set(Object.keys(shapeObj));
+              knownKeys.add("_target");
+              for (const gk of KNOWN_GLOBAL_OPTIONS) knownKeys.add(gk.replace(/-([a-z])/g, (_, c) => c.toUpperCase()));
+              const unknownKeys = Object.keys(params).filter((k) => !knownKeys.has(k));
+              if (unknownKeys.length > 0) {
+                const unknown = unknownKeys.map((k) => `--${k.replace(/([A-Z])/g, "-$1").toLowerCase()}`).join(", ");
+                outputError(
+                  `Unknown parameter: ${unknown}
+Run "xbrowser ${command} ${subCommand} --help" to see available parameters.`
+                );
+                return;
+              }
+            }
+          }
           if (options.target && !params._target) {
             params._target = options.target;
           }
-          const needsBrowser = cmdEntry.scope === "page";
+          const needsBrowser = cmdEntry.scope === "page" || cmdEntry.scope === "browser";
           if (needsBrowser && !process.env.XBROWSER_DAEMON_WORKER) {
             const { forwardExec } = await import("./daemon-client-XWSSQBEA.js");
             const userTimeout = typeof params.timeout === "number" && params.timeout > 0 ? params.timeout * 1e3 + 3e4 : void 0;
@@ -11046,38 +11070,46 @@ Run "xbrowser ${command} --help" to see available commands.`
             }
           };
           try {
+            const cmdStart = Date.now();
+            const cmdHooks = await loadHooks();
+            if (cmdHooks.length > 0 && session?.page) {
+              await Promise.all(cmdHooks.map((h) => h.onBeforeCommand?.({ page: session.page, command: `${command} ${subCommand}`, params })));
+            }
             const result = await cmdEntry.handler(params, ctx);
+            const hookOutputs = [];
+            if (cmdHooks.length > 0 && session?.page) {
+              for (const h of cmdHooks) {
+                const output = await h.onAfterCommand?.({ page: session.page, command: `${command} ${subCommand}`, params, result, duration: Date.now() - cmdStart });
+                if (output) hookOutputs.push({ _hook: h.name, ...output });
+              }
+            }
             if (session && result && result.data) {
               const convUrl = result.data.conversationUrl;
               if (convUrl) {
                 saveSessionDiskMeta(sessionName, { conversationUrl: convUrl, cdpEndpoint });
               }
             }
-            if (isCommandResult2(result)) {
-              if (mode === "json" || mode === "yaml") {
-                console.log(outputFormatter2.format(result.data, { mode, color: false, emoji: false }));
-                if (result.tips?.length) {
-                  for (const tip of result.tips) console.error(`\u{1F4A1} ${tip}`);
-                }
-              } else {
-                console.log(outputFormatter2.format(result.data, { mode: "text", color: true, emoji: true }));
-                if (result.tips?.length) {
-                  for (const tip of result.tips) console.log(`  \u{1F4A1} ${tip}`);
-                }
+            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 (hookOutputs.length > 0) {
+                finalOutput.hooks = hookOutputs;
               }
-            } else if (result && typeof result === "object") {
-              const obj = result;
-              if (mode === "json" || mode === "yaml") {
-                console.log(outputFormatter2.format(obj.data ?? obj, { mode, color: false, emoji: false }));
-                const tips = obj.tips;
-                if (tips?.length) {
-                  for (const tip of tips) console.error(`\u{1F4A1} ${tip}`);
-                }
-              } else {
-                if (obj.data) outputResult(obj.data, mode);
-                const tips = obj.tips;
-                if (tips?.length) {
-                  for (const tip of tips) console.log(`  \u{1F4A1} ${tip}`);
+              console.log(outputFormatter2.format(finalOutput, { mode, color: false, emoji: false }));
+              if (tips?.length) {
+                for (const tip of tips) console.error(`\u{1F4A1} ${tip}`);
+              }
+            } else {
+              console.log(outputFormatter2.format(outputData, { mode: "text", color: true, emoji: true }));
+              if (tips?.length) {
+                for (const tip of tips) console.log(`  \u{1F4A1} ${tip}`);
+              }
+              if (hookOutputs.length > 0) {
+                for (const ho of hookOutputs) {
+                  console.log(`  \u{1F4F8} screenshot: ${ho.screenshot?.url || "captured"}`);
                 }
               }
             }