@workclaw/cli 1.0.23 → 1.0.25

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

@@ -1,3 +1,4 @@
+import * as fsSync from "node:fs";
 import { readFileSync } from "node:fs";
 import path, { resolve, dirname } from "node:path";
 import process$1 from "node:process";
@@ -32,7 +33,9 @@ const ERROR_CODES$1 = {
   NODE_NOT_FOUND: "NODE_NOT_FOUND",
   NPM_NOT_FOUND: "NPM_NOT_FOUND",
   NPM_INSTALL_FAILED: "NPM_INSTALL_FAILED",
-  CONFIG_WRITE_FAILED: "CONFIG_WRITE_FAILED"
+  CONFIG_WRITE_FAILED: "CONFIG_WRITE_FAILED",
+  HTTP_ERROR: "HTTP_ERROR",
+  NETWORK_ERROR: "NETWORK_ERROR"
 };
 let AppError$1 = class AppError extends Error {
   constructor(code, message) {
@@ -111,20 +114,20 @@ async function httpPost(url, data, config) {
       debugLog(`[HTTP POST] 响应状态文本: ${axiosError.response.statusText}`);
       debugLog(`[HTTP POST] 响应数据: ${JSON.stringify(responseData)}`);
       if (typeof responseData === "string") {
-        throw new Error(`请求失败 (${axiosError.response.status}): ${responseData}`);
+        throw new AppError$1(ERROR_CODES$1.HTTP_ERROR, `请求失败 (${axiosError.response.status}): ${responseData}`);
       } else if (responseData && typeof responseData === "object" && "message" in responseData) {
-        throw new Error(`请求失败 (${axiosError.response.status}): ${responseData.message}`);
+        throw new AppError$1(ERROR_CODES$1.HTTP_ERROR, `请求失败 (${axiosError.response.status}): ${responseData.message}`);
       } else {
-        throw new Error(`请求失败 (${axiosError.response.status}): ${axiosError.response.statusText}`);
+        throw new AppError$1(ERROR_CODES$1.HTTP_ERROR, `请求失败 (${axiosError.response.status}): ${axiosError.response.statusText}`);
       }
     } else if (axiosError.request) {
       debugLog(`[HTTP POST] 未收到响应`);
       debugLog(`[HTTP POST] 错误信息: ${axiosError.message}`);
-      throw new Error(`网络错误: ${axiosError.message}`);
+      throw new AppError$1(ERROR_CODES$1.NETWORK_ERROR, `网络错误: ${axiosError.message}`);
     } else {
       debugLog(`[HTTP POST] 请求配置错误`);
       debugLog(`[HTTP POST] 错误信息: ${axiosError.message}`);
-      throw new Error(`请求配置错误: ${axiosError.message}`);
+      throw new AppError$1(ERROR_CODES$1.HTTP_ERROR, `请求配置错误: ${axiosError.message}`);
     }
   }
 }
@@ -4135,6 +4138,74 @@ 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("[安装开始]");
@@ -4279,20 +4350,7 @@ class LocalInstaller {
       throw new AppError$1(ERROR_CODES$1.NPM_INSTALL_FAILED, "插件解压后未找到 package.json");
     }
     debugLog("[下载插件] 插件解压成功");
-    this.spinner.prefixText = this.prefixText;
-    this.spinner.text = `${chalk.cyan("下载插件")} ${chalk.dim("→")} ${chalk.yellow("安装依赖")}`;
-    debugLog("[下载插件] 执行 npm install 安装生产环境依赖");
-    try {
-      execSync("npm install --production", {
-        cwd: paths.target,
-        stdio: "pipe",
-        timeout: 12e4
-      });
-      debugLog("[下载插件] npm install 执行成功");
-    } catch (error) {
-      const errorMsg = error.stderr?.toString() || error.message || "未知错误";
-      debugLog(`[下载插件] npm install 可能存在问题: ${errorMsg}`);
-    }
+    await this.installDependencies(paths.target);
     this.prefixText += chalk.green(`✓ 插件下载完成
 `);
     try {
@@ -4469,9 +4527,14 @@ 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
+            }
           }
         }
       },
@@ -4716,8 +4779,11 @@ const ERROR_CODES = {
   APP_KEY_REQUIRED: "APP_KEY_REQUIRED",
   APP_SECRET_REQUIRED: "APP_SECRET_REQUIRED",
   NODE_VERSION_LOW: "NODE_VERSION_LOW",
+  NODE_NOT_FOUND: "NODE_NOT_FOUND",
   NPM_NOT_FOUND: "NPM_NOT_FOUND",
-  NPM_INSTALL_FAILED: "NPM_INSTALL_FAILED"
+  NPM_INSTALL_FAILED: "NPM_INSTALL_FAILED",
+  CONFIG_WRITE_FAILED: "CONFIG_WRITE_FAILED",
+  PLUGIN_EXTRACT_FAILED: "PLUGIN_EXTRACT_FAILED"
 };
 class AppError2 extends Error {
   constructor(code, message) {
@@ -4766,6 +4832,74 @@ 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");
@@ -4889,28 +5023,13 @@ class BoxInstaller {
         debugLog(`[解压插件] 插件解压成功: ${paths.target}`);
         this.prefixText += chalk.green(`✓ 插件解压成功
 `);
-        this.spinner.prefixText = this.prefixText;
-        this.spinner.text = `${chalk.cyan("安装依赖")} ${chalk.dim("→")} ${chalk.yellow("正在安装...")}`;
-        debugLog("[安装依赖] 执行 npm install 安装生产环境依赖");
-        try {
-          execSync("npm install --production", {
-            cwd: paths.target,
-            stdio: "pipe",
-            timeout: 12e4
-          });
-          debugLog("[安装依赖] npm install 执行成功");
-          this.prefixText += chalk.green(`✓ 依赖安装成功
-`);
-        } catch (error) {
-          const errorMsg = error.stderr?.toString() || error.message || "未知错误";
-          debugLog(`[安装依赖] npm install 可能存在问题: ${errorMsg}`);
-        }
+        await this.installDependencies(paths.target);
         await fs.rm(paths.temp, { recursive: true, force: true });
         debugLog(`[解压插件] 清理临时文件成功`);
         this.prefixText += chalk.green(`✓ 清理临时文件成功
 `);
       } else {
-        throw new Error("解压失败：package 目录不存在");
+        throw new AppError2(ERROR_CODES.PLUGIN_EXTRACT_FAILED, "解压失败：package 目录不存在");
       }
     } catch (error) {
       debugLog(`[解压插件] 解压失败: ${error.message}`);
@@ -5082,6 +5201,8 @@ class BoxInstaller {
           allowInsecureTls: true,
           // 允许原始 JSON 载荷
           allowRawJsonPayload: true,
+          // 用户 ID
+          userId: "",
           accounts: {
             // 账户配置（agentId 为空表示待分配）
             default: { enabled: true, agentId: "" }

package/dist/index.js

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@workclaw/cli",
   "type": "module",
-  "version": "1.0.23",
+  "version": "1.0.25",
   "description": "WorkClaw CLI 工具 - 用于初始化和配置 WorkClaw 插件",
   "license": "MIT",
   "keywords": [