ccman 3.3.11 → 3.3.12

package/dist/index.js

@@ -15,7 +15,7 @@ var init_package = __esm({
   "../core/package.json"() {
     package_default = {
       name: "@ccman/core",
-      version: "3.3.11",
+      version: "3.3.12",
       type: "module",
       description: "Core business logic for ccman - Manage Codex, Claude Code, Gemini CLI, and MCP configurations",
       main: "./dist/index.js",
@@ -1192,21 +1192,50 @@ function createToolManager(tool) {
     }
     writeJSON(configPath, config);
   }
+  function trimInput(value) {
+    if (value === void 0)
+      return void 0;
+    return value.trim();
+  }
+  function trimProvider(input) {
+    return {
+      ...input,
+      name: input.name.trim(),
+      desc: trimInput(input.desc),
+      baseUrl: input.baseUrl.trim(),
+      apiKey: input.apiKey.trim(),
+      model: trimInput(input.model)
+    };
+  }
+  function trimProviderUpdates(updates) {
+    return {
+      ...updates,
+      name: trimInput(updates.name),
+      desc: trimInput(updates.desc),
+      baseUrl: trimInput(updates.baseUrl),
+      apiKey: trimInput(updates.apiKey),
+      model: trimInput(updates.model)
+    };
+  }
   return {
     add(input) {
       const config = loadConfig2();
-      const nameExists = config.providers.some((p) => p.name === input.name);
+      const normalizedInput = trimProvider(input);
+      if (!normalizedInput.name) {
+        throw new Error("\u670D\u52A1\u5546\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A");
+      }
+      const nameExists = config.providers.some((p) => p.name.trim() === normalizedInput.name);
       if (nameExists) {
-        throw new ProviderNameConflictError(input.name);
+        throw new ProviderNameConflictError(normalizedInput.name);
       }
       const timestamp = Date.now();
       const provider = {
         id: generateId(),
-        name: input.name,
-        desc: input.desc,
-        baseUrl: input.baseUrl,
-        apiKey: input.apiKey,
-        model: input.model,
+        name: normalizedInput.name,
+        desc: normalizedInput.desc,
+        baseUrl: normalizedInput.baseUrl,
+        apiKey: normalizedInput.apiKey,
+        model: normalizedInput.model,
         createdAt: timestamp,
         lastModified: timestamp
       };
@@ -1231,8 +1260,10 @@ function createToolManager(tool) {
     },
     findByName(name) {
       const config = loadConfig2();
-      const lowerName = name.toLowerCase();
-      return config.providers.find((p) => p.name.toLowerCase() === lowerName);
+      const lowerName = name.trim().toLowerCase();
+      if (!lowerName)
+        return void 0;
+      return config.providers.find((p) => p.name.trim().toLowerCase() === lowerName);
     },
     switch(id) {
       const config = loadConfig2();
@@ -1259,25 +1290,29 @@ function createToolManager(tool) {
     edit(id, updates) {
       const config = loadConfig2();
       const provider = config.providers.find((p) => p.id === id);
+      const normalizedUpdates = trimProviderUpdates(updates);
       if (!provider) {
         throw new ProviderNotFoundError(id);
       }
-      if (updates.name !== void 0 && updates.name !== provider.name) {
-        const nameConflict = config.providers.some((p) => p.id !== id && p.name === updates.name);
+      if (normalizedUpdates.name !== void 0 && !normalizedUpdates.name) {
+        throw new Error("\u670D\u52A1\u5546\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A");
+      }
+      if (normalizedUpdates.name !== void 0 && normalizedUpdates.name !== provider.name.trim()) {
+        const nameConflict = config.providers.some((p) => p.id !== id && p.name.trim() === normalizedUpdates.name);
         if (nameConflict) {
-          throw new ProviderNameConflictError(updates.name);
+          throw new ProviderNameConflictError(normalizedUpdates.name);
         }
       }
-      if (updates.name !== void 0)
-        provider.name = updates.name;
-      if (updates.desc !== void 0)
-        provider.desc = updates.desc;
-      if (updates.baseUrl !== void 0)
-        provider.baseUrl = updates.baseUrl;
-      if (updates.apiKey !== void 0)
-        provider.apiKey = updates.apiKey;
-      if (updates.model !== void 0)
-        provider.model = updates.model;
+      if (normalizedUpdates.name !== void 0)
+        provider.name = normalizedUpdates.name;
+      if (normalizedUpdates.desc !== void 0)
+        provider.desc = normalizedUpdates.desc;
+      if (normalizedUpdates.baseUrl !== void 0)
+        provider.baseUrl = normalizedUpdates.baseUrl;
+      if (normalizedUpdates.apiKey !== void 0)
+        provider.apiKey = normalizedUpdates.apiKey;
+      if (normalizedUpdates.model !== void 0)
+        provider.model = normalizedUpdates.model;
       provider.lastModified = Date.now();
       saveConfig2(config);
       if (config.currentProviderId === id) {
@@ -1306,15 +1341,19 @@ function createToolManager(tool) {
     clone(sourceId, newName) {
       const source = this.get(sourceId);
       const config = loadConfig2();
-      const nameExists = config.providers.some((p) => p.name === newName);
+      const normalizedName = newName.trim();
+      if (!normalizedName) {
+        throw new Error("\u670D\u52A1\u5546\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A");
+      }
+      const nameExists = config.providers.some((p) => p.name.trim() === normalizedName);
       if (nameExists) {
-        throw new ProviderNameConflictError(newName);
+        throw new ProviderNameConflictError(normalizedName);
       }
       const timestamp = Date.now();
       const newProvider = {
         ...source,
         id: generateId(),
-        name: newName,
+        name: normalizedName,
         desc: void 0,
         createdAt: timestamp,
         lastModified: timestamp,
@@ -1326,18 +1365,27 @@ function createToolManager(tool) {
     },
     addPreset(input) {
       const config = loadConfig2();
+      const normalizedInput = {
+        ...input,
+        name: input.name.trim(),
+        baseUrl: input.baseUrl.trim(),
+        description: input.description.trim()
+      };
+      if (!normalizedInput.name) {
+        throw new Error("\u9884\u7F6E\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A");
+      }
       if (!config.presets) {
         config.presets = [];
       }
       const allPresets = [...toolConfig.builtinPresets, ...config.presets];
-      const nameExists = allPresets.some((p) => p.name === input.name);
+      const nameExists = allPresets.some((p) => p.name.trim() === normalizedInput.name);
       if (nameExists) {
-        throw new PresetNameConflictError(input.name);
+        throw new PresetNameConflictError(normalizedInput.name);
       }
       const preset = {
-        name: input.name,
-        baseUrl: input.baseUrl,
-        description: input.description
+        name: normalizedInput.name,
+        baseUrl: normalizedInput.baseUrl,
+        description: normalizedInput.description
       };
       config.presets.push(preset);
       saveConfig2(config);
@@ -1361,26 +1409,36 @@ function createToolManager(tool) {
     },
     editPreset(name, updates) {
       const config = loadConfig2();
+      const normalizedName = name.trim();
+      const normalizedUpdates = {
+        ...updates,
+        name: trimInput(updates.name),
+        baseUrl: trimInput(updates.baseUrl),
+        description: trimInput(updates.description)
+      };
       if (!config.presets) {
         config.presets = [];
       }
-      const preset = config.presets.find((p) => p.name === name);
+      const preset = config.presets.find((p) => p.name.trim() === normalizedName);
       if (!preset) {
-        throw new Error(`\u9884\u7F6E\u4E0D\u5B58\u5728: ${name}`);
+        throw new Error(`\u9884\u7F6E\u4E0D\u5B58\u5728: ${normalizedName}`);
+      }
+      if (normalizedUpdates.name !== void 0 && !normalizedUpdates.name) {
+        throw new Error("\u9884\u7F6E\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A");
       }
-      if (updates.name !== void 0 && updates.name !== preset.name) {
+      if (normalizedUpdates.name !== void 0 && normalizedUpdates.name !== preset.name.trim()) {
         const allPresets = [...toolConfig.builtinPresets, ...config.presets];
-        const nameConflict = allPresets.some((p) => p.name !== name && p.name === updates.name);
+        const nameConflict = allPresets.some((p) => p.name.trim() !== normalizedName && p.name.trim() === normalizedUpdates.name);
         if (nameConflict) {
-          throw new PresetNameConflictError(updates.name);
+          throw new PresetNameConflictError(normalizedUpdates.name);
         }
       }
-      if (updates.name !== void 0)
-        preset.name = updates.name;
-      if (updates.baseUrl !== void 0)
-        preset.baseUrl = updates.baseUrl;
-      if (updates.description !== void 0)
-        preset.description = updates.description;
+      if (normalizedUpdates.name !== void 0)
+        preset.name = normalizedUpdates.name;
+      if (normalizedUpdates.baseUrl !== void 0)
+        preset.baseUrl = normalizedUpdates.baseUrl;
+      if (normalizedUpdates.description !== void 0)
+        preset.description = normalizedUpdates.description;
       saveConfig2(config);
       return {
         ...preset,
@@ -1389,12 +1447,13 @@ function createToolManager(tool) {
     },
     removePreset(name) {
       const config = loadConfig2();
+      const normalizedName = name.trim();
       if (!config.presets) {
         return;
       }
-      const index = config.presets.findIndex((p) => p.name === name);
+      const index = config.presets.findIndex((p) => p.name.trim() === normalizedName);
       if (index === -1) {
-        throw new Error(`Preset not found: ${name}`);
+        throw new Error(`Preset not found: ${normalizedName}`);
       }
       config.presets.splice(index, 1);
       saveConfig2(config);
@@ -1534,8 +1593,16 @@ function getSyncConfig() {
   return config.sync || null;
 }
 function saveSyncConfig(syncConfig) {
+  const normalizedSyncConfig = {
+    ...syncConfig,
+    webdavUrl: syncConfig.webdavUrl.trim(),
+    username: syncConfig.username.trim(),
+    password: syncConfig.password.trim(),
+    remoteDir: syncConfig.remoteDir?.trim(),
+    syncPassword: syncConfig.syncPassword?.trim()
+  };
   const config = loadConfig();
-  config.sync = syncConfig;
+  config.sync = normalizedSyncConfig;
   saveConfig(config);
 }
 function updateLastSyncTime() {
@@ -1570,9 +1637,9 @@ function joinPath(baseDir, filename) {
   return `${normalizedBase}/${normalizedFile}`;
 }
 function createWebDAVClient(config) {
-  const client = createClient(config.webdavUrl, {
-    username: config.username,
-    password: config.password,
+  const client = createClient(config.webdavUrl.trim(), {
+    username: config.username.trim(),
+    password: config.password.trim(),
     authType: config.authType || "password",
     // 默认使用 Basic Auth
     maxBodyLength: 100 * 1024 * 1024,
@@ -3263,7 +3330,7 @@ async function promptProviderForm(defaults) {
       message: "\u670D\u52A1\u5546\u540D\u79F0:",
       default: defaults?.name || void 0,
       validate: (value) => {
-        if (!value) return "\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A";
+        if (!value?.trim()) return "\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A";
         return true;
       }
     },
@@ -3279,8 +3346,9 @@ async function promptProviderForm(defaults) {
       message: "API \u5730\u5740:",
       default: defaults?.baseUrl || void 0,
       validate: (value) => {
-        if (!value) return "API \u5730\u5740\u4E0D\u80FD\u4E3A\u7A7A";
-        if (!value.startsWith("http://") && !value.startsWith("https://")) {
+        const trimmed = value?.trim();
+        if (!trimmed) return "API \u5730\u5740\u4E0D\u80FD\u4E3A\u7A7A";
+        if (!trimmed.startsWith("http://") && !trimmed.startsWith("https://")) {
           return "API \u5730\u5740\u5FC5\u987B\u4EE5 http:// \u6216 https:// \u5F00\u5934";
         }
         return true;
@@ -3293,16 +3361,16 @@ async function promptProviderForm(defaults) {
       default: defaults?.apiKey || void 0,
       mask: "*",
       validate: (value) => {
-        if (!value) return "API \u5BC6\u94A5\u4E0D\u80FD\u4E3A\u7A7A";
+        if (!value?.trim()) return "API \u5BC6\u94A5\u4E0D\u80FD\u4E3A\u7A7A";
         return true;
       }
     }
   ]);
   return {
-    name: answers.name,
-    desc: answers.desc || void 0,
-    baseUrl: answers.baseUrl,
-    apiKey: answers.apiKey
+    name: answers.name.trim(),
+    desc: answers.desc?.trim() || void 0,
+    baseUrl: answers.baseUrl.trim(),
+    apiKey: answers.apiKey.trim()
   };
 }
 async function startMainMenu() {
@@ -6392,12 +6460,12 @@ async function promptApiKey() {
       message: "\u8BF7\u8F93\u5165 GMN API Key:",
       mask: "*",
       validate: (value) => {
-        if (!value) return "API Key \u4E0D\u80FD\u4E3A\u7A7A";
+        if (!value?.trim()) return "API Key \u4E0D\u80FD\u4E3A\u7A7A";
         return true;
       }
     }
   ]);
-  return answers.apiKey;
+  return answers.apiKey.trim();
 }
 async function promptPlatforms() {
   const answers = await inquirer33.prompt([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccman",
-  "version": "3.3.11",
+  "version": "3.3.12",
   "type": "module",
   "description": "Manage Codex, Claude Code, Gemini CLI, OpenCode, and MCP API service provider configurations",
   "main": "./dist/index.js",