@workclaw/cli 1.0.323 → 1.0.327

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;AAkEhE,qBAAa,YAAY;IAIX,OAAO,CAAC,MAAM;IAH1B,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,UAAU,CAAa;gBAEX,MAAM,EAAE,kBAAkB;IAI9C,cAAc,IAAI,IAAI;IAyBtB,OAAO,CAAC,QAAQ;IAoChB,OAAO,CAAC,aAAa;IAMrB,aAAa,IAAI,MAAM;IAIvB,OAAO,CAAC,cAAc;IAOhB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YA0BhB,eAAe;YA0Bf,iBAAiB;YAoHjB,cAAc;CAoR7B"}
+{"version":3,"file":"installer.d.ts","sourceRoot":"","sources":["../../../src/box/installer/installer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAgB,MAAM,UAAU,CAAA;AA2EhE,qBAAa,YAAY;IAIX,OAAO,CAAC,MAAM;IAH1B,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,UAAU,CAAa;gBAEX,MAAM,EAAE,kBAAkB;IAI9C,cAAc,IAAI,IAAI;IAyBtB,OAAO,CAAC,QAAQ;IAoChB,OAAO,CAAC,aAAa;IAMrB,aAAa,IAAI,MAAM;IAIvB,OAAO,CAAC,cAAc;IAOhB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YA0BhB,eAAe;YA0Bf,iBAAiB;YAoHjB,cAAc;CAoR7B"}

package/dist/{index-xy26TrIZ.js → index-DthSFxr_.js}

@@ -14,15 +14,11 @@ import fs from "node:fs/promises";
 import ora from "ora";
 import tar from "tar";
 import axios from "axios";
-import os from "node:os";
 import crypto from "node:crypto";
+import os from "node:os";
 const debug = new Debug();
 function setDebug(enabled) {
-  if (enabled) {
-    debug.enable();
-  } else {
-    debug.disable();
-  }
+  debug.enable(enabled);
 }
 const ERROR_CODES$1 = {
   PHONE_REQUIRED: "PHONE_REQUIRED",
@@ -101,6 +97,14 @@ const wsUrlSchema = z$1.string().url({
   message: "请输入有效的 WebSocket URL"
 }).optional();
 z$1.boolean();
+function cleanWindowsLongPath(inputPath) {
+  return inputPath.replace(/^[\\?]+/, "");
+}
+function normalizePath(inputPath) {
+  const cleaned = cleanWindowsLongPath(inputPath);
+  const normalized = path.normalize(cleaned);
+  return path.resolve(normalized);
+}
 function validateOpenclawPath(openclawPath) {
   debug.log(`[路径验证] 开始验证路径: ${openclawPath}`);
   const result = openclawPathSchema.safeParse(openclawPath);
@@ -208,8 +212,14 @@ function deepMerge$1(target, source) {
       const sourceValue = source[key];
       const targetValue = target[key];
       if (Array.isArray(sourceValue) && Array.isArray(targetValue)) {
-        const mergedArray = [.../* @__PURE__ */ new Set([...targetValue, ...sourceValue])];
-        result[key] = mergedArray;
+        if (key === "models" && targetValue.length > 0 && typeof targetValue[0] === "object" && "id" in targetValue[0]) {
+          const existingIds = new Set(targetValue.map((item) => item.id));
+          const newItems = sourceValue.filter((item) => !existingIds.has(item.id));
+          result[key] = [...targetValue, ...newItems];
+        } else {
+          const mergedArray = [.../* @__PURE__ */ new Set([...targetValue, ...sourceValue])];
+          result[key] = mergedArray;
+        }
       } else if (sourceValue !== void 0 && sourceValue !== null && typeof sourceValue === "object" && !Array.isArray(sourceValue) && typeof targetValue === "object" && targetValue !== null && !Array.isArray(targetValue)) {
         result[key] = deepMerge$1(
           targetValue,
@@ -263,7 +273,7 @@ class BoxInstaller {
       } catch (error) {
         throw new AppError2(ERROR_CODES.INVALID_OPENCLAW_PATH, error.message);
       }
-      baseDir = this.config.openclawPath;
+      baseDir = normalizePath(this.config.openclawPath);
     } else {
       const home = getHomeDir$1();
       baseDir = path.join(home, config.DIRS.OPENCLAW);
@@ -4914,8 +4924,14 @@ function deepMerge(target, source) {
       const sourceValue = source[key];
       const targetValue = target[key];
       if (Array.isArray(sourceValue) && Array.isArray(targetValue)) {
-        const mergedArray = [.../* @__PURE__ */ new Set([...targetValue, ...sourceValue])];
-        result[key] = mergedArray;
+        if (key === "models" && targetValue.length > 0 && typeof targetValue[0] === "object" && "id" in targetValue[0]) {
+          const existingIds = new Set(targetValue.map((item) => item.id));
+          const newItems = sourceValue.filter((item) => !existingIds.has(item.id));
+          result[key] = [...targetValue, ...newItems];
+        } else {
+          const mergedArray = [.../* @__PURE__ */ new Set([...targetValue, ...sourceValue])];
+          result[key] = mergedArray;
+        }
       } else if (sourceValue !== void 0 && sourceValue !== null && typeof sourceValue === "object" && !Array.isArray(sourceValue) && typeof targetValue === "object" && targetValue !== null && !Array.isArray(targetValue)) {
         result[key] = deepMerge(
           targetValue,
@@ -4971,7 +4987,7 @@ class LocalInstaller {
         } catch (error) {
           throw new AppError$1(ERROR_CODES$1.INVALID_OPENCLAW_PATH, error.message);
         }
-        baseDir = this.config.openclawPath;
+        baseDir = normalizePath(this.config.openclawPath);
       } else {
         const homeDir = getHomeDir();
         baseDir = path.join(homeDir, this.envConfig.DIRS.OPENCLAW);
@@ -5502,7 +5518,8 @@ async function createLocalCommand(options) {
     ));
     if (options.printToken) {
       const token = installer.getToken();
-      console.log("\n" + chalk.cyan("Token: ") + token);
+      console.log(`
+${chalk.cyan("Token: ")}${token}`);
     }
   } catch (error) {
     debug.log(`[初始化] 发生错误: ${error.message}`);
@@ -5522,7 +5539,7 @@ async function createLocalCommand(options) {
   }
 }
 function registerCommands(program2) {
-  program2.command("local").description("本地账户安装（需要登录）").option("-e, --env <env>", "环境 (test/prod/custom)").option("--phone <phone>", "手机号码").option("--user-pass <userPass>", "用户密码").option("--custom-ip <ip>", "自定义后端 IP（仅 custom 环境生效）").option("--ws-url <url>", "自定义 WebSocket URL（仅 custom 环境生效，默认自动生成）").option("--plugin-version <plugin-version>", "插件版本号（默认最新版）").option("--openclaw-path <path>", "OpenClaw 安装目录路径（默认 ~/.openclaw）").option("--debug", "开启调试日志").option("--print-token", "执行完成后输出 token").action(createLocalCommand);
+  program2.command("local").description("本地账户安装（需要登录）").option("-e, --env <env>", "环境 (test/prod/custom)").option("--phone <phone>", "手机号码").option("--user-pass <userPass>", "用户密码").option("--custom-ip <ip>", "自定义后端 IP（仅 custom 环境生效）").option("--ws-url <url>", "自定义 WebSocket URL（仅 custom 环境生效，默认自动生成）").option("--plugin-version <plugin-version>", "插件版本号（默认最新版）").option("--openclaw-path <path>", "OpenClaw 安装目录路径（默认 ~/.openclaw）").option("--debug", "开启调试日志").action(createLocalCommand);
 }
 const __filename$1 = fileURLToPath(import.meta.url);
 const __dirname$1 = dirname(__filename$1);

package/dist/index.js

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

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/local/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAGxC,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAavD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/local/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAGxC,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAYvD"}

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;AAgF/E;;;GAGG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsB;IAC7C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAiB;IAC3C,OAAO,CAAC,KAAK,CAAa;IAE1B;;OAEG;gBACS,MAAM,EAAE,oBAAoB;IAOxC;;OAEG;IACH,cAAc,IAAI,IAAI;IAUtB;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAgE9B;;OAEG;IACH,aAAa,IAAI,MAAM;IAIvB;;OAEG;IACH,QAAQ,IAAI,MAAM;IAIlB;;OAEG;IACH,OAAO,CAAC,cAAc;IAOtB;;OAEG;YACW,OAAO;IAoBrB;;OAEG;YACW,kBAAkB;IAchC;;OAEG;YACW,eAAe;IAmB7B;;OAEG;YACW,iBAAiB;IAoH/B;;OAEG;YACW,cAAc;CAmN7B"}
+{"version":3,"file":"installer.d.ts","sourceRoot":"","sources":["../../../src/local/installer/installer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAA6B,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAyF/E;;;GAGG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsB;IAC7C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAiB;IAC3C,OAAO,CAAC,KAAK,CAAa;IAE1B;;OAEG;gBACS,MAAM,EAAE,oBAAoB;IAOxC;;OAEG;IACH,cAAc,IAAI,IAAI;IAUtB;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAgE9B;;OAEG;IACH,aAAa,IAAI,MAAM;IAIvB;;OAEG;IACH,QAAQ,IAAI,MAAM;IAIlB;;OAEG;IACH,OAAO,CAAC,cAAc;IAOtB;;OAEG;YACW,OAAO;IAoBrB;;OAEG;YACW,kBAAkB;IAchC;;OAEG;YACW,eAAe;IAmB7B;;OAEG;YACW,iBAAiB;IAoH/B;;OAEG;YACW,cAAc;CAmN7B"}

package/dist/shared/utils/debug.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"debug.d.ts","sourceRoot":"","sources":["../../../src/shared/utils/debug.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AAErC,QAAA,MAAM,KAAK,OAAc,CAAA;AAEzB;;GAEG;AACH,wBAAgB,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAO/C;AAED;;GAEG;AACH,wBAAgB,WAAW,IAAI,OAAO,CAErC;AAED,OAAO,EAAE,KAAK,EAAE,CAAA"}
+{"version":3,"file":"debug.d.ts","sourceRoot":"","sources":["../../../src/shared/utils/debug.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AAErC,QAAA,MAAM,KAAK,OAAc,CAAA;AAEzB;;GAEG;AACH,wBAAgB,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAE/C;AAED;;GAEG;AACH,wBAAgB,WAAW,IAAI,OAAO,CAErC;AAED,OAAO,EAAE,KAAK,EAAE,CAAA"}

package/dist/shared/utils/index.d.ts

@@ -2,6 +2,6 @@ export { debug, isDebugMode, setDebug } from './debug';
 export { checkEnv } from './env';
 export { createLogger, logger } from './logger';
 export type { Logger } from './logger';
-export { validateOpenclawPath } from './path';
+export { normalizePath, validateOpenclawPath } from './path';
 export { absolutePathSchema, appKeySchema, appSecretSchema, booleanSchema, EnvironmentSchema, ipv4Schema, isValid, openclawPathSchema, phoneSchema, pluginVersionSchema, userPassSchema, validate, validateWithMessage, windowsPathSchema, withMessage, wsUrlSchema, } from './validate';
 //# sourceMappingURL=index.d.ts.map

package/dist/shared/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/shared/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAChC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAC/C,YAAY,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,QAAQ,CAAA;AAC7C,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,UAAU,EACV,OAAO,EACP,kBAAkB,EAClB,WAAW,EACX,mBAAmB,EACnB,cAAc,EACd,QAAQ,EACR,mBAAmB,EACnB,iBAAiB,EACjB,WAAW,EACX,WAAW,GACZ,MAAM,YAAY,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/shared/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAChC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAC/C,YAAY,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACtC,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,QAAQ,CAAA;AAC5D,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,UAAU,EACV,OAAO,EACP,kBAAkB,EAClB,WAAW,EACX,mBAAmB,EACnB,cAAc,EACd,QAAQ,EACR,mBAAmB,EACnB,iBAAiB,EACjB,WAAW,EACX,WAAW,GACZ,MAAM,YAAY,CAAA"}

package/dist/shared/utils/path.d.ts

@@ -1,3 +1,9 @@
+/**
+ * 规范化路径格式
+ * @param inputPath - 原始路径
+ * @returns 规范化后的绝对路径
+ */
+export declare function normalizePath(inputPath: string): string;
 /**
  * 验证 OpenClaw 安装路径
  * @param openclawPath - 待验证的路径

package/dist/shared/utils/path.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"path.d.ts","sourceRoot":"","sources":["../../../src/shared/utils/path.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAU/D"}
+{"version":3,"file":"path.d.ts","sourceRoot":"","sources":["../../../src/shared/utils/path.ts"],"names":[],"mappings":"AAcA;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAIvD;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAU/D"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@workclaw/cli",
   "type": "module",
-  "version": "1.0.323",
+  "version": "1.0.327",
   "description": "WorkClaw CLI 工具 - 用于初始化和配置 WorkClaw 插件",
   "license": "MIT",
   "keywords": [
@@ -26,7 +26,7 @@
     "build": "vite build"
   },
   "dependencies": {
-    "@mingto/debug": "^1.0.25",
+    "@mingto/debug": "^1.0.27",
     "@types/semver": "^7.7.0",
     "@types/tar": "^6.1.13",
     "axios": "^1.7.9",
@@ -40,4 +40,4 @@
     "tar": "^6.2.1",
     "zod": "^4.3.6"
   }
-}
+}