@workclaw/cli 1.0.31 → 1.0.312

package/dist/box/installer/installer.d.ts

@@ -8,6 +8,7 @@ export declare class BoxInstaller {
     private getPaths;
     private updateSpinner;
     getPrefixText(): string;
+    private getPackageName;
     install(): Promise<void>;
     private doCleanOldFiles;
     private doDownloadFromNpm;

package/dist/box/installer/installer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"installer.d.ts","sourceRoot":"","sources":["../../../src/box/installer/installer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAgB,MAAM,UAAU,CAAA;AAoDhE,qBAAa,YAAY;IAIX,OAAO,CAAC,MAAM;IAH1B,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,UAAU,CAAa;gBAEX,MAAM,EAAE,kBAAkB;IAI9C,cAAc,IAAI,IAAI;IAatB,OAAO,CAAC,QAAQ;IAmBhB,OAAO,CAAC,aAAa;IAMrB,aAAa,IAAI,MAAM;IAIjB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YA0BhB,eAAe;YA0Bf,iBAAiB;YAuBjB,cAAc;CAqQ7B"}
+{"version":3,"file":"installer.d.ts","sourceRoot":"","sources":["../../../src/box/installer/installer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAgB,MAAM,UAAU,CAAA;AAqDhE,qBAAa,YAAY;IAIX,OAAO,CAAC,MAAM;IAH1B,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,UAAU,CAAa;gBAEX,MAAM,EAAE,kBAAkB;IAI9C,cAAc,IAAI,IAAI;IAatB,OAAO,CAAC,QAAQ;IAmBhB,OAAO,CAAC,aAAa;IAMrB,aAAa,IAAI,MAAM;IAIvB,OAAO,CAAC,cAAc;IAOhB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YA0BhB,eAAe;YA0Bf,iBAAiB;YAoHjB,cAAc;CAiR7B"}

package/dist/{index-BBOjut3R.js → index-CVmebGfl.js}

@@ -9,6 +9,7 @@ import chalk from "chalk";
 import inquirer from "inquirer";
 import semver from "semver";
 import fs from "node:fs/promises";
+import tar from "tar";
 import ora from "ora";
 import axios from "axios";
 import "node:os";
@@ -146,6 +147,12 @@ class BoxInstaller {
   getPrefixText() {
     return this.prefixText;
   }
+  getPackageName() {
+    if (this.config.pluginVersion) {
+      return `${PLUGIN_PACKAGE_NAME$1}@${this.config.pluginVersion}`;
+    }
+    return PLUGIN_PACKAGE_NAME$1;
+  }
   async install() {
     try {
       debugLog("[盒子安装] 开始安装...");
@@ -190,25 +197,97 @@ class BoxInstaller {
     }
   }
   async doDownloadFromNpm() {
-    debugLog("[安装插件] 开始安装插件...");
-    this.prefixText += chalk.green(`  ✓ 开始安装插件
-`);
+    const paths = this.getPaths();
+    this.spinner.prefixText = this.prefixText;
+    this.spinner.text = chalk.cyan("正在准备安装目录...");
+    debugLog("[下载插件] 创建扩展目录...");
+    await fs.mkdir(paths.extensions, { recursive: true });
+    debugLog(`[下载插件] 扩展目录: ${paths.extensions}`);
+    const tempDir = path.join(paths.temp, `install-${Date.now()}`);
+    debugLog(`[下载插件] 创建临时目录: ${tempDir}`);
+    await fs.mkdir(tempDir, { recursive: true });
     this.spinner.prefixText = this.prefixText;
-    this.spinner.text = chalk.cyan("正在安装插件...");
+    this.spinner.text = chalk.cyan("正在下载插件...");
+    debugLog("[下载插件] 执行 npm pack 下载源码包");
+    debugLog(`[下载插件] 工作目录: ${tempDir}`);
+    const maxRetries = 3;
+    let lastError = "";
+    let tarballPath = "";
+    for (let i = 1; i <= maxRetries; i++) {
+      this.spinner.prefixText = this.prefixText;
+      this.spinner.text = chalk.cyan(`正在下载 (${i}/${maxRetries})...`);
+      debugLog(`[下载插件] 第 ${i} 次尝试下载 tarball...`);
+      try {
+        const packageName = this.getPackageName();
+        debugLog(`[下载插件] 下载包名: ${packageName}`);
+        this.spinner.text = chalk.cyan("正在从 npm 获取插件...");
+        const output = await execAsync$1(
+          `npm pack ${packageName} --registry=https://mirrors.tencent.com/npm/ --ignore-scripts --quiet`,
+          { cwd: tempDir, timeout: 12e4 }
+        );
+        const lines = output.trim().split("\n").filter((line) => line.trim());
+        const filename = lines[lines.length - 1] || "";
+        tarballPath = path.join(tempDir, filename);
+        debugLog(`[下载插件] tarball 下载成功: ${tarballPath}`);
+        break;
+      } catch (error) {
+        lastError = error.message || "未知错误";
+        debugLog(`[下载插件] 第 ${i} 次尝试失败: ${lastError}`);
+        if (i < maxRetries) {
+          this.spinner.text = chalk.cyan(`下载失败，3秒后重试...`);
+          debugLog("[下载插件] 等待 3 秒后重试...");
+          await new Promise((resolve2) => setTimeout(resolve2, 3e3));
+        }
+      }
+    }
+    if (!tarballPath || !await fs.access(tarballPath).then(() => true).catch(() => false)) {
+      throw new AppError$1(ERROR_CODES$1.NPM_INSTALL_FAILED, `tarball 下载失败: ${lastError}`);
+    }
+    this.spinner.prefixText = this.prefixText;
+    this.spinner.text = chalk.cyan("正在解压插件...");
+    debugLog(`[下载插件] 创建插件目录: ${paths.target}`);
+    await fs.mkdir(paths.target, { recursive: true });
+    debugLog(`[下载插件] 解压 tarball 到: ${paths.target}`);
     try {
-      await execAsync$1(
-        `openclaw plugins install ${PLUGIN_PACKAGE_NAME$1} --dangerously-force-unsafe-install --pin`,
-        { timeout: 12e4 }
-      );
-      debugLog("[安装插件] openclaw plugins install 执行成功");
-      this.prefixText += chalk.green(`  ✓ 插件安装完成
-`);
+      await tar.extract({
+        file: tarballPath,
+        cwd: paths.target,
+        strip: 1
+      });
+      debugLog("[下载插件] tarball 解压成功");
     } catch (error) {
-      const errorMsg = error.message || "未知错误";
-      debugLog(`[安装插件] 安装失败: ${errorMsg}`);
-      this.prefixText += chalk.red(`✗ 安装失败
+      throw new AppError$1(ERROR_CODES$1.NPM_INSTALL_FAILED, `tarball 解压失败: ${error.message}`);
+    }
+    const pluginPath = path.join(paths.target, "package.json");
+    const pluginExists = await fs.access(pluginPath).then(() => true).catch(() => false);
+    if (!pluginExists) {
+      throw new AppError$1(ERROR_CODES$1.NPM_INSTALL_FAILED, "插件解压后未找到 package.json");
+    }
+    debugLog("[下载插件] 插件解压成功");
+    this.spinner.prefixText = this.prefixText;
+    this.spinner.text = chalk.cyan("正在安装依赖...");
+    debugLog("[下载插件] 执行 npm install 安装生产环境依赖");
+    try {
+      await execAsync$1("npm install --omit=dev --ignore-scripts --quiet", {
+        cwd: paths.target,
+        timeout: 12e4
+      });
+      debugLog("[下载插件] npm install 执行成功");
+    } catch (error) {
+      const errorMsg = error.message || "";
+      if (errorMsg.includes("npm warn") || errorMsg.includes("deprecated")) {
+        debugLog("[下载插件] npm install 有警告但可能成功，继续流程");
+      } else {
+        debugLog(`[下载插件] npm install 失败: ${errorMsg}`);
+      }
+    }
+    this.prefixText += chalk.green(`  ✓ 插件安装完成
 `);
-      throw new AppError$1(ERROR_CODES$1.NPM_INSTALL_FAILED, `插件安装失败: ${errorMsg}`);
+    try {
+      await fs.rm(tempDir, { recursive: true, force: true });
+      debugLog("[下载插件] 清理临时目录完成");
+    } catch {
+      debugLog("[下载插件] 清理临时目录失败（忽略）");
     }
   }
   async doUpdateConfig(paths) {
@@ -444,7 +523,19 @@ class BoxInstaller {
         redactPatterns: ["sk-.*"]
       },
       // plugins: 插件配置
-      plugins: {}
+      plugins: {
+        allow: [config.PLUGIN_NAME],
+        installs: {
+          [config.PLUGIN_NAME]: {
+            source: "npm",
+            spec: PLUGIN_PACKAGE_NAME$1,
+            installPath: paths.target
+          }
+        },
+        entries: {
+          [config.PLUGIN_NAME]: { enabled: true }
+        }
+      }
     };
     const finalConfig = deepMerge$1(originalConfig, newConfig);
     this.updateSpinner("正在写入配置...");
@@ -4692,6 +4783,12 @@ class LocalInstaller {
   getPrefixText() {
     return this.prefixText;
   }
+  getPackageName() {
+    if (this.config.pluginVersion) {
+      return `${PLUGIN_PACKAGE_NAME}@${this.config.pluginVersion}`;
+    }
+    return PLUGIN_PACKAGE_NAME;
+  }
   async doLogin(env) {
     this.spinner.prefixText = this.prefixText;
     this.spinner.text = chalk.cyan("正在验证账号...");
@@ -4740,60 +4837,96 @@ class LocalInstaller {
   }
   async doDownloadFromNpm(paths) {
     this.spinner.prefixText = this.prefixText;
-    this.spinner.text = chalk.cyan("正在安装插件...");
-    debugLog("[安装插件] 创建扩展目录...");
+    this.spinner.text = chalk.cyan("正在准备安装目录...");
+    debugLog("[下载插件] 创建扩展目录...");
     await fs.mkdir(paths.extensions, { recursive: true });
-    debugLog(`[安装插件] 扩展目录: ${paths.extensions}`);
-    debugLog("[安装插件] 直接使用 pnpm 从 npm 安装...");
-    try {
-      await fs.mkdir(paths.target, { recursive: true });
-      const packageJson = {
-        name: "temp-install",
-        version: "1.0.0",
-        private: true
-      };
-      await fs.writeFile(
-        path.join(paths.target, "package.json"),
-        JSON.stringify(packageJson, null, 2)
-      );
-      debugLog(`[安装插件] 执行 pnpm add ${PLUGIN_PACKAGE_NAME}`);
-      await execAsync(
-        `pnpm add ${PLUGIN_PACKAGE_NAME}`,
-        { cwd: paths.target, timeout: 12e4 }
-      );
-      const nodeModulesPath = path.join(paths.target, "node_modules", PLUGIN_PACKAGE_NAME);
-      const files = await fs.readdir(nodeModulesPath);
-      for (const file of files) {
-        const srcPath = path.join(nodeModulesPath, file);
-        const destPath = path.join(paths.target, file);
-        await fs.rename(srcPath, destPath);
-      }
-      await fs.rm(path.join(paths.target, "node_modules"), { recursive: true, force: true });
-      await fs.unlink(path.join(paths.target, "package.json"));
-      if (await fs.access(path.join(paths.target, "pnpm-lock.yaml")).then(() => true).catch(() => false)) {
-        await fs.unlink(path.join(paths.target, "pnpm-lock.yaml"));
-      }
-      debugLog("[安装插件] pnpm 安装完成");
-      this.prefixText += chalk.green(`  ✓ 插件安装完成
-`);
-    } catch (error) {
-      const errorMsg = error.message || "未知错误";
-      debugLog(`[安装插件] 安装失败: ${errorMsg}`);
-      debugLog("[安装插件] 尝试使用 openclaw 安装...");
+    debugLog(`[下载插件] 扩展目录: ${paths.extensions}`);
+    const tempDir = path.join(paths.temp, `install-${Date.now()}`);
+    debugLog(`[下载插件] 创建临时目录: ${tempDir}`);
+    await fs.mkdir(tempDir, { recursive: true });
+    this.spinner.prefixText = this.prefixText;
+    this.spinner.text = chalk.cyan("正在下载插件...");
+    debugLog("[下载插件] 执行 npm pack 下载源码包");
+    debugLog(`[下载插件] 工作目录: ${tempDir}`);
+    const maxRetries = 3;
+    let lastError = "";
+    let tarballPath = "";
+    for (let i = 1; i <= maxRetries; i++) {
+      this.spinner.prefixText = this.prefixText;
+      this.spinner.text = chalk.cyan(`正在下载 (${i}/${maxRetries})...`);
+      debugLog(`[下载插件] 第 ${i} 次尝试下载 tarball...`);
       try {
-        await execAsync(
-          `openclaw plugins install ${PLUGIN_PACKAGE_NAME} --dangerously-force-unsafe-install`,
-          { timeout: 12e4 }
+        const packageName = this.getPackageName();
+        debugLog(`[下载插件] 下载包名: ${packageName}`);
+        this.spinner.text = chalk.cyan("正在从 npm 获取插件...");
+        const output = await execAsync(
+          `npm pack ${packageName} --registry=https://mirrors.tencent.com/npm/ --ignore-scripts --quiet`,
+          { cwd: tempDir, timeout: 12e4 }
         );
-        debugLog("[安装插件] openclaw plugins install 执行成功");
-        this.prefixText += chalk.green(`  ✓ 插件安装完成
-`);
-      } catch (fallbackError) {
-        const fallbackErrorMsg = fallbackError.message || "未知错误";
-        debugLog(`[安装插件] openclaw 安装也失败: ${fallbackErrorMsg}`);
-        throw new AppError2(ERROR_CODES.NPM_INSTALL_FAILED, `插件安装失败: ${fallbackErrorMsg}`);
+        const lines = output.trim().split("\n").filter((line) => line.trim());
+        const filename = lines[lines.length - 1] || "";
+        tarballPath = path.join(tempDir, filename);
+        debugLog(`[下载插件] tarball 下载成功: ${tarballPath}`);
+        break;
+      } catch (error) {
+        lastError = error.message || "未知错误";
+        debugLog(`[下载插件] 第 ${i} 次尝试失败: ${lastError}`);
+        if (i < maxRetries) {
+          this.spinner.text = chalk.cyan(`下载失败，3秒后重试...`);
+          debugLog("[下载插件] 等待 3 秒后重试...");
+          await new Promise((resolve2) => setTimeout(resolve2, 3e3));
+        }
       }
     }
+    if (!tarballPath || !await fs.access(tarballPath).then(() => true).catch(() => false)) {
+      throw new AppError2(ERROR_CODES.NPM_INSTALL_FAILED, `tarball 下载失败: ${lastError}`);
+    }
+    this.spinner.prefixText = this.prefixText;
+    this.spinner.text = chalk.cyan("正在解压插件...");
+    debugLog(`[下载插件] 创建插件目录: ${paths.target}`);
+    await fs.mkdir(paths.target, { recursive: true });
+    debugLog(`[下载插件] 解压 tarball 到: ${paths.target}`);
+    try {
+      await tar.extract({
+        file: tarballPath,
+        cwd: paths.target,
+        strip: 1
+      });
+      debugLog("[下载插件] tarball 解压成功");
+    } catch (error) {
+      throw new AppError2(ERROR_CODES.NPM_INSTALL_FAILED, `tarball 解压失败: ${error.message}`);
+    }
+    const pluginPath = path.join(paths.target, "package.json");
+    const pluginExists = await fs.access(pluginPath).then(() => true).catch(() => false);
+    if (!pluginExists) {
+      throw new AppError2(ERROR_CODES.NPM_INSTALL_FAILED, "插件解压后未找到 package.json");
+    }
+    debugLog("[下载插件] 插件解压成功");
+    this.spinner.prefixText = this.prefixText;
+    this.spinner.text = chalk.cyan("正在安装依赖...");
+    debugLog("[下载插件] 执行 npm install 安装生产环境依赖");
+    try {
+      await execAsync("npm install --omit=dev --ignore-scripts --quiet", {
+        cwd: paths.target,
+        timeout: 12e4
+      });
+      debugLog("[下载插件] npm install 执行成功");
+    } catch (error) {
+      const errorMsg = error.message || "";
+      if (errorMsg.includes("npm warn") || errorMsg.includes("deprecated")) {
+        debugLog("[下载插件] npm install 有警告但可能成功，继续流程");
+      } else {
+        debugLog(`[下载插件] npm install 失败: ${errorMsg}`);
+      }
+    }
+    this.prefixText += chalk.green(`  ✓ 插件安装完成
+`);
+    try {
+      await fs.rm(tempDir, { recursive: true, force: true });
+      debugLog("[下载插件] 清理临时目录完成");
+    } catch {
+      debugLog("[下载插件] 清理临时目录失败（忽略）");
+    }
   }
   async doUpdateConfig(paths, boundConfig, env) {
     this.spinner.prefixText = this.prefixText;

package/dist/index.js

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
-import("./index-BBOjut3R.js").then((cli) => {
+import("./index-CVmebGfl.js").then((cli) => {
   cli.default();
 });

package/dist/local/installer/installer.d.ts

@@ -7,6 +7,7 @@ export declare class LocalInstaller {
     validateConfig(): void;
     install(): Promise<void>;
     getPrefixText(): string;
+    private getPackageName;
     private doLogin;
     private doFetchBoundConfig;
     private doCleanOldFiles;

package/dist/local/installer/installer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"installer.d.ts","sourceRoot":"","sources":["../../../src/local/installer/installer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAA6B,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAsD/E,qBAAa,cAAc;IAIb,OAAO,CAAC,MAAM;IAH1B,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,UAAU,CAAa;gBAEX,MAAM,EAAE,oBAAoB;IAIhD,cAAc,IAAI,IAAI;IAYhB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAoC9B,aAAa,IAAI,MAAM;YAIT,OAAO;YAoBP,kBAAkB;YAalB,eAAe;YAmBf,iBAAiB;YA2EjB,cAAc;CA+M7B"}
+{"version":3,"file":"installer.d.ts","sourceRoot":"","sources":["../../../src/local/installer/installer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAA6B,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAuD/E,qBAAa,cAAc;IAIb,OAAO,CAAC,MAAM;IAH1B,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,UAAU,CAAa;gBAEX,MAAM,EAAE,oBAAoB;IAIhD,cAAc,IAAI,IAAI;IAYhB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAoC9B,aAAa,IAAI,MAAM;IAIvB,OAAO,CAAC,cAAc;YAOR,OAAO;YAoBP,kBAAkB;YAalB,eAAe;YAmBf,iBAAiB;YAmHjB,cAAc;CA+M7B"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@workclaw/cli",
   "type": "module",
-  "version": "1.0.31",
+  "version": "1.0.312",
   "description": "WorkClaw CLI 工具 - 用于初始化和配置 WorkClaw 插件",
   "license": "MIT",
   "keywords": [
@@ -27,6 +27,7 @@
   },
   "dependencies": {
     "@types/semver": "^7.7.0",
+    "@types/tar": "^6.1.13",
     "axios": "^1.7.9",
     "boxen": "^8.0.1",
     "chalk": "^5.6.2",
@@ -34,6 +35,7 @@
     "inquirer": "^12.7.0",
     "jsencrypt": "^3.5.4",
     "ora": "^8.2.0",
-    "semver": "^7.7.1"
+    "semver": "^7.7.1",
+    "tar": "^6.2.1"
   }
 }