@workclaw/cli 1.0.25 → 1.0.26

package/dist/{index-C1oCz010.js → index-BWLa_Wav.js}

@@ -1,4 +1,3 @@
-import * as fsSync from "node:fs";
 import { readFileSync } from "node:fs";
 import path, { resolve, dirname } from "node:path";
 import process$1 from "node:process";
@@ -4138,74 +4137,6 @@ class LocalInstaller {
     }
     debugLog("[验证配置] 配置验证通过");
   }
-  async installDependencies(targetPath) {
-    this.spinner.prefixText = this.prefixText;
-    this.spinner.text = `${chalk.cyan("安装依赖")} ${chalk.dim("→")} ${chalk.yellow("正在安装...")}`;
-    const checkDependencies = () => {
-      try {
-        const nodeModulesPath = path.join(targetPath, "node_modules");
-        const packageJsonPath = path.join(targetPath, "package.json");
-        try {
-          fsSync.accessSync(nodeModulesPath);
-        } catch {
-          return false;
-        }
-        const packageJson = JSON.parse(fsSync.readFileSync(packageJsonPath, "utf-8"));
-        const dependencies = Object.keys(packageJson.dependencies || {});
-        for (const dep of dependencies) {
-          const depPath = path.join(nodeModulesPath, dep);
-          if (!fsSync.existsSync(depPath)) {
-            debugLog(`[依赖检查] 缺少依赖: ${dep}`);
-            return false;
-          }
-        }
-        return true;
-      } catch {
-        return false;
-      }
-    };
-    const runInstall = () => {
-      try {
-        debugLog("[安装依赖] 执行 npm install");
-        execSync("npm install --production", {
-          cwd: targetPath,
-          stdio: "pipe",
-          timeout: 12e4
-        });
-        debugLog("[安装依赖] npm install 执行成功");
-        return true;
-      } catch (error) {
-        const errorMsg = error.stderr?.toString() || error.message || "未知错误";
-        debugLog(`[安装依赖] npm install 失败: ${errorMsg}`);
-        return false;
-      }
-    };
-    if (checkDependencies()) {
-      debugLog("[安装依赖] 依赖检查通过");
-      this.prefixText += chalk.green(`✓ 依赖检查通过
-`);
-      return;
-    }
-    debugLog("[安装依赖] 依赖检查失败，尝试重新安装...");
-    if (runInstall()) {
-      if (checkDependencies()) {
-        this.prefixText += chalk.green(`✓ 依赖安装成功
-`);
-        return;
-      }
-    }
-    debugLog("[安装依赖] 第一次安装失败，尝试完整安装...");
-    if (runInstall()) {
-      if (checkDependencies()) {
-        this.prefixText += chalk.green(`✓ 依赖安装成功
-`);
-        return;
-      }
-    }
-    this.prefixText += chalk.red(`✗ 依赖安装失败
-`);
-    throw new AppError$1(ERROR_CODES$1.NPM_INSTALL_FAILED, "插件依赖安装失败，请检查网络和 npm 配置");
-  }
   async install() {
     try {
       debugLog("[安装开始]");
@@ -4226,8 +4157,8 @@ class LocalInstaller {
       debugLog(`[路径配置] target=${paths.target}`);
       debugLog(`[路径配置] config=${paths.config}`);
       debugLog(`[路径配置] workspace=${paths.workspace}`);
-      await this.doLogin(env);
-      const boundConfig = await this.doFetchBoundConfig(env);
+      const token = await this.doLogin(env);
+      const boundConfig = await this.doFetchBoundConfig(env, token);
       await this.doCleanOldFiles(paths.target);
       await this.doDownloadFromNpm(paths);
       await this.doUpdateConfig(paths, boundConfig, env);
@@ -4251,16 +4182,15 @@ class LocalInstaller {
     }
     debugLog("[用户登录] 密码加密成功");
     debugLog("[用户登录] 调用登录接口...");
-    await login(this.config.phone, encryptedPassword, env);
+    const token = await login(this.config.phone, encryptedPassword, env);
     this.prefixText += chalk.green(`✓ 用户登录成功
 `);
     debugLog("[用户登录] 登录成功");
+    return token;
   }
-  async doFetchBoundConfig(env) {
+  async doFetchBoundConfig(env, token) {
     this.spinner.prefixText = this.prefixText;
     this.spinner.text = `${chalk.cyan("获取配置")} ${chalk.dim("→")} ${chalk.yellow("正在获取绑定配置...")}`;
-    debugLog("[获取配置] 获取 token...");
-    const token = await login(this.config.phone, rsaEncrypt(this.config.userPass), env);
     debugLog("[获取配置] 调用绑定配置接口...");
     const boundConfig = await fetchBoundConfig(token, this.config.phone, env);
     debugLog(`[获取配置] agentId=${boundConfig.agentId}, appKey=${boundConfig.appKey?.slice(0, 8)}...`);
@@ -4350,7 +4280,26 @@ class LocalInstaller {
       throw new AppError$1(ERROR_CODES$1.NPM_INSTALL_FAILED, "插件解压后未找到 package.json");
     }
     debugLog("[下载插件] 插件解压成功");
-    await this.installDependencies(paths.target);
+    this.spinner.prefixText = this.prefixText;
+    this.spinner.text = `${chalk.cyan("下载插件")} ${chalk.dim("→")} ${chalk.yellow("安装依赖")}`;
+    debugLog("[下载插件] 执行 npm install 安装生产环境依赖");
+    try {
+      execSync("npm install --omit=dev --ignore-scripts", {
+        cwd: paths.target,
+        stdio: "pipe",
+        timeout: 12e4
+      });
+      debugLog("[下载插件] npm install 执行成功");
+    } catch (error) {
+      const stderr = error.stderr?.toString() || "";
+      const stdout = error.stdout?.toString() || "";
+      const combinedOutput = stderr + stdout;
+      if (combinedOutput.includes("npm warn") || combinedOutput.includes("deprecated")) {
+        debugLog("[下载插件] npm install 有警告但可能成功，继续流程");
+      } else {
+        debugLog(`[下载插件] npm install 失败: ${combinedOutput}`);
+      }
+    }
     this.prefixText += chalk.green(`✓ 插件下载完成
 `);
     try {
@@ -4527,14 +4476,9 @@ class LocalInstaller {
           allowInsecureTls: true,
           // 允许原始 JSON 载荷
           allowRawJsonPayload: true,
-          // 用户 ID
-          userId: boundConfig.userId,
           accounts: {
             // 账户配置（agentId 从服务器获取）
-            default: {
-              enabled: true,
-              agentId: boundConfig.agentId
-            }
+            default: { enabled: true, agentId: boundConfig.agentId }
           }
         }
       },
@@ -4609,7 +4553,6 @@ class LocalInstaller {
             installPath: paths.target
           }
         },
-        // 插件加载路径（本地开发或自定义安装位置）
         load: {
           paths: [paths.target]
         },
@@ -4832,74 +4775,6 @@ class BoxInstaller {
     }
     debugLog("[验证配置] 配置检查通过");
   }
-  async installDependencies(targetPath) {
-    this.spinner.prefixText = this.prefixText;
-    this.spinner.text = `${chalk.cyan("安装依赖")} ${chalk.dim("→")} ${chalk.yellow("正在安装...")}`;
-    const checkDependencies = () => {
-      try {
-        const nodeModulesPath = path.join(targetPath, "node_modules");
-        const packageJsonPath = path.join(targetPath, "package.json");
-        try {
-          fsSync.accessSync(nodeModulesPath);
-        } catch {
-          return false;
-        }
-        const packageJson = JSON.parse(fsSync.readFileSync(packageJsonPath, "utf-8"));
-        const dependencies = Object.keys(packageJson.dependencies || {});
-        for (const dep of dependencies) {
-          const depPath = path.join(nodeModulesPath, dep);
-          if (!fsSync.existsSync(depPath)) {
-            debugLog(`[依赖检查] 缺少依赖: ${dep}`);
-            return false;
-          }
-        }
-        return true;
-      } catch {
-        return false;
-      }
-    };
-    const runInstall = () => {
-      try {
-        debugLog("[安装依赖] 执行 npm install");
-        execSync("npm install --production", {
-          cwd: targetPath,
-          stdio: "pipe",
-          timeout: 12e4
-        });
-        debugLog("[安装依赖] npm install 执行成功");
-        return true;
-      } catch (error) {
-        const errorMsg = error.stderr?.toString() || error.message || "未知错误";
-        debugLog(`[安装依赖] npm install 失败: ${errorMsg}`);
-        return false;
-      }
-    };
-    if (checkDependencies()) {
-      debugLog("[安装依赖] 依赖检查通过");
-      this.prefixText += chalk.green(`✓ 依赖检查通过
-`);
-      return;
-    }
-    debugLog("[安装依赖] 依赖检查失败，尝试重新安装...");
-    if (runInstall()) {
-      if (checkDependencies()) {
-        this.prefixText += chalk.green(`✓ 依赖安装成功
-`);
-        return;
-      }
-    }
-    debugLog("[安装依赖] 第一次安装失败，尝试完整安装...");
-    if (runInstall()) {
-      if (checkDependencies()) {
-        this.prefixText += chalk.green(`✓ 依赖安装成功
-`);
-        return;
-      }
-    }
-    this.prefixText += chalk.red(`✗ 依赖安装失败
-`);
-    throw new AppError2(ERROR_CODES.NPM_INSTALL_FAILED, "插件依赖安装失败，请检查网络和 npm 配置");
-  }
   getPaths() {
     const home = getHomeDir();
     const openclawDir = path.join(home, ".openclaw");
@@ -5023,7 +4898,30 @@ class BoxInstaller {
         debugLog(`[解压插件] 插件解压成功: ${paths.target}`);
         this.prefixText += chalk.green(`✓ 插件解压成功
 `);
-        await this.installDependencies(paths.target);
+        this.spinner.prefixText = this.prefixText;
+        this.spinner.text = `${chalk.cyan("安装依赖")} ${chalk.dim("→")} ${chalk.yellow("正在安装...")}`;
+        debugLog("[安装依赖] 执行 npm install 安装生产环境依赖");
+        try {
+          execSync("npm install --omit=dev --ignore-scripts", {
+            cwd: paths.target,
+            stdio: "pipe",
+            timeout: 12e4
+          });
+          debugLog("[安装依赖] npm install 执行成功");
+          this.prefixText += chalk.green(`✓ 依赖安装成功
+`);
+        } catch (error) {
+          const stderr = error.stderr?.toString() || "";
+          const stdout = error.stdout?.toString() || "";
+          const combinedOutput = stderr + stdout;
+          if (combinedOutput.includes("npm warn") || combinedOutput.includes("deprecated")) {
+            debugLog("[安装依赖] npm install 有警告但可能成功，继续流程");
+            this.prefixText += chalk.green(`✓ 依赖安装完成
+`);
+          } else {
+            debugLog(`[安装依赖] npm install 失败: ${combinedOutput}`);
+          }
+        }
         await fs.rm(paths.temp, { recursive: true, force: true });
         debugLog(`[解压插件] 清理临时文件成功`);
         this.prefixText += chalk.green(`✓ 清理临时文件成功

package/dist/index.js

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@workclaw/cli",
   "type": "module",
-  "version": "1.0.25",
+  "version": "1.0.26",
   "description": "WorkClaw CLI 工具 - 用于初始化和配置 WorkClaw 插件",
   "license": "MIT",
   "keywords": [
@@ -38,4 +38,4 @@
     "semver": "^7.7.1",
     "tar": "^7.4.0"
   }
-}
+}