@xbrowser/cli 1.24.0 → 1.24.1

package/dist/{chunk-BROEUPL3.js → chunk-5PZXCIDR.js}

@@ -7146,7 +7146,7 @@ function setWSServerCache(browserContext, server) {
 import {
   Core
 } from "@dyyz1993/xcli-core";
-import { resolve as resolve2 } from "path";
+import { resolve as resolve2, basename, dirname as dirname3 } from "path";
 import { existsSync as existsSync6, readdirSync } from "fs";
 import { homedir as homedir4 } from "os";
 
@@ -7450,6 +7450,8 @@ var XBrowserPluginLoader = class {
   core;
   loader;
   options;
+  /** 目录名 → 该插件注册的 site 名（site.name ≠ 目录名时的命令别名兜底） */
+  dirSiteAliases = /* @__PURE__ */ new Map();
   constructor(options) {
     patchLoginRequired();
     this.options = options ?? {};
@@ -7487,15 +7489,39 @@ var XBrowserPluginLoader = class {
   getLoadedPlugins() {
     return this.loader.getLoadedPlugins();
   }
+  /**
+   * 目录名别名兜底（小白用户实测踩坑）：`plugin list` 显示目录名，但命令路由
+   * 按 site.name 匹配——两者不一致时（如目录 alibaba-1688、site 名 1688），
+   * 用户按 list 显示的名字敲命令会 "Unknown command"。映射在 scanAndLoad/
+   * loadPlugin 时通过加载前后 site 快照 diff 记录（instance.siteName 返回的是
+   * 插件 id 而非 site 名，不可用）。
+   */
+  resolveSiteName(name) {
+    if (this.core.loader.getSite(name)) return name;
+    const aliased = this.dirSiteAliases.get(name);
+    if (aliased && this.core.loader.getSite(aliased)) return aliased;
+    return void 0;
+  }
+  /** 记录一次插件加载引入的 site：加载前后快照 diff（同插件可注册多个 site） */
+  recordSiteAliases(pluginDirName, before) {
+    for (const site of this.core.loader.getSites()) {
+      if (!before.has(site.name)) this.dirSiteAliases.set(pluginDirName, site.name);
+    }
+  }
   getPluginContract(siteName, commandName) {
-    const site = this.core.loader.getSite(siteName);
+    const resolved = this.resolveSiteName(siteName);
+    if (!resolved) return void 0;
+    const site = this.core.loader.getSite(resolved);
     if (!site) return void 0;
     const contract = buildPluginContract(site);
     if (!commandName) return contract;
     return contract.commands.find((command) => command.name === commandName);
   }
   async loadPlugin(pluginPath, id) {
-    return this.loader.loadPlugin(pluginPath, id);
+    const before = new Set(this.core.loader.getSites().map((s) => s.name));
+    const instance = await this.loader.loadPlugin(pluginPath, id);
+    this.recordSiteAliases(basename(dirname3(pluginPath)), before);
+    return instance;
   }
   async unloadPlugin(id) {
     return this.loader.unloadPlugin(id);
@@ -8837,7 +8863,8 @@ async function executeChain(input, options) {
         const cmdArgs = parts.slice(1);
         const loader = await getPluginLoader();
         const internalLoader = loader.getCore().loader;
-        const site = internalLoader.getSite(cmdName);
+        const resolvedName = loader.resolveSiteName(cmdName);
+        const site = resolvedName ? internalLoader.getSite(resolvedName) : void 0;
         if (site) {
           const subCommand = cmdArgs[0];
           if (!subCommand) {

package/dist/{chunk-A7RZYSWM.js → chunk-AYNFXG7V.js}

@@ -7045,7 +7045,7 @@ function attachDetectAntiBot(ctx) {
 import {
   Core
 } from "@dyyz1993/xcli-core";
-import { resolve as resolve2 } from "path";
+import { resolve as resolve2, basename, dirname as dirname3 } from "path";
 import { existsSync as existsSync6, readdirSync } from "fs";
 import { homedir as homedir5 } from "os";
 
@@ -7349,6 +7349,8 @@ var XBrowserPluginLoader = class {
   core;
   loader;
   options;
+  /** 目录名 → 该插件注册的 site 名（site.name ≠ 目录名时的命令别名兜底） */
+  dirSiteAliases = /* @__PURE__ */ new Map();
   constructor(options) {
     patchLoginRequired();
     this.options = options ?? {};
@@ -7386,15 +7388,39 @@ var XBrowserPluginLoader = class {
   getLoadedPlugins() {
     return this.loader.getLoadedPlugins();
   }
+  /**
+   * 目录名别名兜底（小白用户实测踩坑）：`plugin list` 显示目录名，但命令路由
+   * 按 site.name 匹配——两者不一致时（如目录 alibaba-1688、site 名 1688），
+   * 用户按 list 显示的名字敲命令会 "Unknown command"。映射在 scanAndLoad/
+   * loadPlugin 时通过加载前后 site 快照 diff 记录（instance.siteName 返回的是
+   * 插件 id 而非 site 名，不可用）。
+   */
+  resolveSiteName(name) {
+    if (this.core.loader.getSite(name)) return name;
+    const aliased = this.dirSiteAliases.get(name);
+    if (aliased && this.core.loader.getSite(aliased)) return aliased;
+    return void 0;
+  }
+  /** 记录一次插件加载引入的 site：加载前后快照 diff（同插件可注册多个 site） */
+  recordSiteAliases(pluginDirName, before) {
+    for (const site of this.core.loader.getSites()) {
+      if (!before.has(site.name)) this.dirSiteAliases.set(pluginDirName, site.name);
+    }
+  }
   getPluginContract(siteName, commandName) {
-    const site = this.core.loader.getSite(siteName);
+    const resolved = this.resolveSiteName(siteName);
+    if (!resolved) return void 0;
+    const site = this.core.loader.getSite(resolved);
     if (!site) return void 0;
     const contract = buildPluginContract(site);
     if (!commandName) return contract;
     return contract.commands.find((command) => command.name === commandName);
   }
   async loadPlugin(pluginPath, id) {
-    return this.loader.loadPlugin(pluginPath, id);
+    const before = new Set(this.core.loader.getSites().map((s) => s.name));
+    const instance = await this.loader.loadPlugin(pluginPath, id);
+    this.recordSiteAliases(basename(dirname3(pluginPath)), before);
+    return instance;
   }
   async unloadPlugin(id) {
     return this.loader.unloadPlugin(id);
@@ -8517,7 +8543,8 @@ async function executeChain(input, options) {
         const cmdArgs = parts.slice(1);
         const loader = await getPluginLoader();
         const internalLoader = loader.getCore().loader;
-        const site = internalLoader.getSite(cmdName);
+        const resolvedName = loader.resolveSiteName(cmdName);
+        const site = resolvedName ? internalLoader.getSite(resolvedName) : void 0;
         if (site) {
           const subCommand = cmdArgs[0];
           if (!subCommand) {

package/dist/{chunk-A3MORKYR.js → chunk-OSZNJT4U.js}

@@ -2,7 +2,7 @@
 import {
   Core
 } from "@dyyz1993/xcli-core";
-import { resolve as resolve2 } from "path";
+import { resolve as resolve2, basename, dirname } from "path";
 import { existsSync as existsSync3, readdirSync } from "fs";
 import { homedir } from "os";
 
@@ -306,6 +306,8 @@ var XBrowserPluginLoader = class {
   core;
   loader;
   options;
+  /** 目录名 → 该插件注册的 site 名（site.name ≠ 目录名时的命令别名兜底） */
+  dirSiteAliases = /* @__PURE__ */ new Map();
   constructor(options) {
     patchLoginRequired();
     this.options = options ?? {};
@@ -343,15 +345,39 @@ var XBrowserPluginLoader = class {
   getLoadedPlugins() {
     return this.loader.getLoadedPlugins();
   }
+  /**
+   * 目录名别名兜底（小白用户实测踩坑）：`plugin list` 显示目录名，但命令路由
+   * 按 site.name 匹配——两者不一致时（如目录 alibaba-1688、site 名 1688），
+   * 用户按 list 显示的名字敲命令会 "Unknown command"。映射在 scanAndLoad/
+   * loadPlugin 时通过加载前后 site 快照 diff 记录（instance.siteName 返回的是
+   * 插件 id 而非 site 名，不可用）。
+   */
+  resolveSiteName(name) {
+    if (this.core.loader.getSite(name)) return name;
+    const aliased = this.dirSiteAliases.get(name);
+    if (aliased && this.core.loader.getSite(aliased)) return aliased;
+    return void 0;
+  }
+  /** 记录一次插件加载引入的 site：加载前后快照 diff（同插件可注册多个 site） */
+  recordSiteAliases(pluginDirName, before) {
+    for (const site of this.core.loader.getSites()) {
+      if (!before.has(site.name)) this.dirSiteAliases.set(pluginDirName, site.name);
+    }
+  }
   getPluginContract(siteName, commandName) {
-    const site = this.core.loader.getSite(siteName);
+    const resolved = this.resolveSiteName(siteName);
+    if (!resolved) return void 0;
+    const site = this.core.loader.getSite(resolved);
     if (!site) return void 0;
     const contract = buildPluginContract(site);
     if (!commandName) return contract;
     return contract.commands.find((command) => command.name === commandName);
   }
   async loadPlugin(pluginPath, id) {
-    return this.loader.loadPlugin(pluginPath, id);
+    const before = new Set(this.core.loader.getSites().map((s) => s.name));
+    const instance = await this.loader.loadPlugin(pluginPath, id);
+    this.recordSiteAliases(basename(dirname(pluginPath)), before);
+    return instance;
   }
   async unloadPlugin(id) {
     return this.loader.unloadPlugin(id);

package/dist/cli.js

@@ -16,7 +16,7 @@ import {
   loadHooks,
   parsePluginParams,
   readJsonFile
-} from "./chunk-A7RZYSWM.js";
+} from "./chunk-AYNFXG7V.js";
 import "./chunk-JKVUFP3G.js";
 import {
   forwardCommandLog,
@@ -629,6 +629,9 @@ async function installFromMarketplace(pluginsDir, slug, options) {
   const realSlug = String(plugin.slug || slug);
   try {
     await downloadAndExtractMarketplaceTarball(baseUrl, realSlug, tmpDir, targetDir);
+  } catch (err) {
+    safeCleanup5(targetDir);
+    throw err;
   } finally {
     safeCleanup5(tmpDir);
   }
@@ -802,6 +805,7 @@ function ensureIndexFile(plugin, name, targetDir) {
 }
 
 // src/plugin/installer.ts
+import { safeCleanup as safeCleanup6 } from "@dyyz1993/xcli-core";
 var PluginInstaller = class {
   pluginsDir;
   constructor(pluginsDir) {
@@ -827,31 +831,29 @@ var PluginInstaller = class {
     }
     mkdirSync4(targetDir, { recursive: true });
     const resolvedSource = type === "npm" ? await resolveNpmPackageWithFallback(source) : source;
+    const withCleanup = async (fn) => {
+      try {
+        const r = await fn();
+        await this.fixSharedDeps(targetDir);
+        ensurePluginDependencies(this.pluginsDir);
+        if (!existsSync6(resolve6(targetDir, "index.ts")) && !existsSync6(resolve6(targetDir, "index.js"))) {
+          throw new Error("installed package has no index.ts/js entry");
+        }
+        return r;
+      } catch (err) {
+        safeCleanup6(targetDir);
+        throw err;
+      }
+    };
     switch (type) {
       case "local":
-        return await installFromLocal(source, name, targetDir).then(async (r) => {
-          await this.fixSharedDeps(targetDir);
-          ensurePluginDependencies(this.pluginsDir);
-          return r;
-        });
+        return await withCleanup(() => installFromLocal(source, name, targetDir));
       case "npm":
-        return await installFromNpm(resolvedSource, name, targetDir).then(async (r) => {
-          await this.fixSharedDeps(targetDir);
-          ensurePluginDependencies(this.pluginsDir);
-          return r;
-        });
+        return await withCleanup(() => installFromNpm(resolvedSource, name, targetDir));
       case "git":
-        return await installFromGit(source, name, targetDir).then(async (r) => {
-          await this.fixSharedDeps(targetDir);
-          ensurePluginDependencies(this.pluginsDir);
-          return r;
-        });
+        return await withCleanup(() => installFromGit(source, name, targetDir));
       case "url":
-        return await installFromUrl(source, name, targetDir).then(async (r) => {
-          await this.fixSharedDeps(targetDir);
-          ensurePluginDependencies(this.pluginsDir);
-          return r;
-        });
+        return await withCleanup(() => installFromUrl(source, name, targetDir));
     }
   }
   /**
@@ -5816,7 +5818,14 @@ async function routeCommand(argvIn, stdinCommands) {
       default: {
         const loader = await getPluginLoader();
         const internalLoader = loader.getCore().loader;
-        const site = internalLoader.getSite(command);
+        const resolvedSiteName = loader.resolveSiteName(command);
+        const site = resolvedSiteName ? internalLoader.getSite(resolvedSiteName) : void 0;
+        if (site && resolvedSiteName !== command) {
+          if (mode !== "json" && mode !== "yaml") {
+            process.stderr.write(`\u2139\uFE0F "${command}" \u7684\u547D\u4EE4\u540D\u662F "${resolvedSiteName}"\uFF08\u63D2\u4EF6\u76EE\u5F55\u540D\u4E0E\u7AD9\u70B9\u540D\u4E0D\u4E00\u81F4\uFF0C\u5DF2\u81EA\u52A8\u6620\u5C04\uFF09
+`);
+          }
+        }
         if (!site) {
           const globalFlagSet = /* @__PURE__ */ new Set(["--session", "--cdp", "--json", "--yaml", "--help", "-h", "--version", "--output", "-o"]);
           const cleanParts = [];
@@ -6272,7 +6281,7 @@ async function handleRemote(args, options, mode) {
   }
 }
 async function startMcpServer() {
-  const { startMcpStdio } = await import("./server-YVMWMNHD.js");
+  const { startMcpStdio } = await import("./server-KSHSG4TY.js");
   startMcpStdio();
 }
 

package/dist/daemon-main.js

@@ -4,7 +4,7 @@ import {
 } from "./chunk-JKVUFP3G.js";
 import {
   getPluginLoader
-} from "./chunk-A3MORKYR.js";
+} from "./chunk-OSZNJT4U.js";
 import {
   version
 } from "./chunk-43TEMG4U.js";
@@ -8098,7 +8098,8 @@ async function executeChain(input, options) {
         const cmdArgs = parts.slice(1);
         const loader = await getPluginLoader();
         const internalLoader = loader.getCore().loader;
-        const site = internalLoader.getSite(cmdName);
+        const resolvedName = loader.resolveSiteName(cmdName);
+        const site = resolvedName ? internalLoader.getSite(resolvedName) : void 0;
         if (site) {
           const subCommand = cmdArgs[0];
           if (!subCommand) {
@@ -9238,9 +9239,9 @@ function createRPCHandler() {
     return result;
   }
   async function handlePluginsReload() {
-    const { resetPluginLoader } = await import("./plugin-singleton-GJO7EZXB.js");
+    const { resetPluginLoader } = await import("./plugin-singleton-GGSBI3EG.js");
     resetPluginLoader();
-    const loader = await import("./plugin-singleton-GJO7EZXB.js").then((m) => m.getPluginLoader());
+    const loader = await import("./plugin-singleton-GGSBI3EG.js").then((m) => m.getPluginLoader());
     const sites = loader.getCore().loader.getSites();
     return { ok: true, plugins: sites.length };
   }

package/dist/index.d.ts

@@ -1634,6 +1634,8 @@ declare class XBrowserPluginLoader {
     private core;
     private loader;
     private options;
+    /** 目录名 → 该插件注册的 site 名（site.name ≠ 目录名时的命令别名兜底） */
+    private dirSiteAliases;
     constructor(options?: PluginLoaderOptions);
     getAPI(): XCLIAPI;
     /**
@@ -1644,6 +1646,16 @@ declare class XBrowserPluginLoader {
     getPlugin(id: string): PluginInstance | undefined;
     getPluginStatus(id: string): PluginStatus;
     getLoadedPlugins(): PluginInstance[];
+    /**
+     * 目录名别名兜底（小白用户实测踩坑）：`plugin list` 显示目录名，但命令路由
+     * 按 site.name 匹配——两者不一致时（如目录 alibaba-1688、site 名 1688），
+     * 用户按 list 显示的名字敲命令会 "Unknown command"。映射在 scanAndLoad/
+     * loadPlugin 时通过加载前后 site 快照 diff 记录（instance.siteName 返回的是
+     * 插件 id 而非 site 名，不可用）。
+     */
+    resolveSiteName(name: string): string | undefined;
+    /** 记录一次插件加载引入的 site：加载前后快照 diff（同插件可注册多个 site） */
+    private recordSiteAliases;
     getPluginContract(siteName: string, commandName?: string): PluginContract | PluginCommandContract | undefined;
     loadPlugin(pluginPath: string, id?: string): Promise<PluginInstance>;
     unloadPlugin(id: string): Promise<void>;

package/dist/index.js

@@ -48,7 +48,7 @@ import {
   splitCommand,
   waitForAIResponse,
   waitForPage
-} from "./chunk-BROEUPL3.js";
+} from "./chunk-5PZXCIDR.js";
 import {
   SessionRecorder
 } from "./chunk-IR6C24P7.js";
@@ -720,6 +720,9 @@ async function installFromMarketplace(pluginsDir, slug, options) {
   const realSlug = String(plugin.slug || slug);
   try {
     await downloadAndExtractMarketplaceTarball(baseUrl, realSlug, tmpDir, targetDir);
+  } catch (err) {
+    safeCleanup5(targetDir);
+    throw err;
   } finally {
     safeCleanup5(tmpDir);
   }
@@ -893,6 +896,7 @@ function ensureIndexFile(plugin, name, targetDir) {
 }
 
 // src/plugin/installer.ts
+import { safeCleanup as safeCleanup6 } from "@dyyz1993/xcli-core";
 var PluginInstaller = class {
   pluginsDir;
   constructor(pluginsDir) {
@@ -918,31 +922,29 @@ var PluginInstaller = class {
     }
     mkdirSync4(targetDir, { recursive: true });
     const resolvedSource = type === "npm" ? await resolveNpmPackageWithFallback(source) : source;
+    const withCleanup = async (fn) => {
+      try {
+        const r = await fn();
+        await this.fixSharedDeps(targetDir);
+        ensurePluginDependencies(this.pluginsDir);
+        if (!existsSync6(resolve6(targetDir, "index.ts")) && !existsSync6(resolve6(targetDir, "index.js"))) {
+          throw new Error("installed package has no index.ts/js entry");
+        }
+        return r;
+      } catch (err) {
+        safeCleanup6(targetDir);
+        throw err;
+      }
+    };
     switch (type) {
       case "local":
-        return await installFromLocal(source, name, targetDir).then(async (r) => {
-          await this.fixSharedDeps(targetDir);
-          ensurePluginDependencies(this.pluginsDir);
-          return r;
-        });
+        return await withCleanup(() => installFromLocal(source, name, targetDir));
       case "npm":
-        return await installFromNpm(resolvedSource, name, targetDir).then(async (r) => {
-          await this.fixSharedDeps(targetDir);
-          ensurePluginDependencies(this.pluginsDir);
-          return r;
-        });
+        return await withCleanup(() => installFromNpm(resolvedSource, name, targetDir));
       case "git":
-        return await installFromGit(source, name, targetDir).then(async (r) => {
-          await this.fixSharedDeps(targetDir);
-          ensurePluginDependencies(this.pluginsDir);
-          return r;
-        });
+        return await withCleanup(() => installFromGit(source, name, targetDir));
       case "url":
-        return await installFromUrl(source, name, targetDir).then(async (r) => {
-          await this.fixSharedDeps(targetDir);
-          ensurePluginDependencies(this.pluginsDir);
-          return r;
-        });
+        return await withCleanup(() => installFromUrl(source, name, targetDir));
     }
   }
   /**
@@ -5912,7 +5914,14 @@ async function routeCommand(argvIn, stdinCommands) {
       default: {
         const loader = await getPluginLoader();
         const internalLoader = loader.getCore().loader;
-        const site = internalLoader.getSite(command);
+        const resolvedSiteName = loader.resolveSiteName(command);
+        const site = resolvedSiteName ? internalLoader.getSite(resolvedSiteName) : void 0;
+        if (site && resolvedSiteName !== command) {
+          if (mode !== "json" && mode !== "yaml") {
+            process.stderr.write(`\u2139\uFE0F "${command}" \u7684\u547D\u4EE4\u540D\u662F "${resolvedSiteName}"\uFF08\u63D2\u4EF6\u76EE\u5F55\u540D\u4E0E\u7AD9\u70B9\u540D\u4E0D\u4E00\u81F4\uFF0C\u5DF2\u81EA\u52A8\u6620\u5C04\uFF09
+`);
+          }
+        }
         if (!site) {
           const globalFlagSet = /* @__PURE__ */ new Set(["--session", "--cdp", "--json", "--yaml", "--help", "-h", "--version", "--output", "-o"]);
           const cleanParts = [];
@@ -6368,7 +6377,7 @@ async function handleRemote(args, options, mode) {
   }
 }
 async function startMcpServer() {
-  const { startMcpStdio } = await import("./server-NPINOVJS.js");
+  const { startMcpStdio } = await import("./server-NXXU3UGI.js");
   startMcpStdio();
 }
 

package/dist/{plugin-singleton-GJO7EZXB.js → plugin-singleton-GGSBI3EG.js}

@@ -1,7 +1,7 @@
 import {
   getPluginLoader,
   resetPluginLoader
-} from "./chunk-A3MORKYR.js";
+} from "./chunk-OSZNJT4U.js";
 import "./chunk-KFQGP6VL.js";
 export {
   getPluginLoader,

package/dist/{server-YVMWMNHD.js → server-KSHSG4TY.js}

@@ -1,7 +1,7 @@
 import {
   executeChain,
   executeCommand
-} from "./chunk-A7RZYSWM.js";
+} from "./chunk-AYNFXG7V.js";
 import "./chunk-JKVUFP3G.js";
 import "./chunk-3OD76SUE.js";
 import "./chunk-ZTHE5RBZ.js";

package/dist/{server-NPINOVJS.js → server-NXXU3UGI.js}

@@ -1,7 +1,7 @@
 import {
   executeChain,
   executeCommand
-} from "./chunk-BROEUPL3.js";
+} from "./chunk-5PZXCIDR.js";
 import "./chunk-2Q3GQRUP.js";
 import "./chunk-JKVUFP3G.js";
 import "./chunk-3OD76SUE.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xbrowser/cli",
-  "version": "1.24.0",
+  "version": "1.24.1",
   "description": "Browser automation CLI for web scraping, headless browsing, SEO analysis, and AI agent workflows. A command-line alternative to Playwright, Puppeteer, and Selenium.",
   "type": "module",
   "bin": {