ccman 3.0.26 → 3.0.28

package/dist/index.js

@@ -39,7 +39,7 @@ var init_package = __esm({
   "../core/package.json"() {
     package_default = {
       name: "@ccman/core",
-      version: "3.0.26",
+      version: "3.0.28",
       type: "module",
       description: "Core business logic for ccman",
       main: "./dist/index.js",
@@ -2323,6 +2323,8 @@ function migrateMCPConfig(config) {
         server.enabledApps = ["claude"];
       }
     }
+  } else {
+    config.servers = [];
   }
   return config;
 }
@@ -2656,6 +2658,7 @@ function createToolManager(tool) {
       const provider = {
         id: generateId(),
         name: input.name,
+        desc: input.desc,
         baseUrl: input.baseUrl,
         apiKey: input.apiKey,
         model: input.model,
@@ -2722,6 +2725,8 @@ function createToolManager(tool) {
       }
       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)
@@ -2765,6 +2770,7 @@ function createToolManager(tool) {
         ...source,
         id: generateId(),
         name: newName,
+        desc: void 0,
         createdAt: timestamp,
         lastModified: timestamp,
         lastUsedAt: void 0
@@ -16228,7 +16234,7 @@ function normalizePath(dir) {
   if (!dir || dir === "/") {
     return "/";
   }
-  let normalized = dir.trim().replace(/^\/+/, "").replace(/\/+$/, "");
+  const normalized = dir.trim().replace(/^\/+/, "").replace(/\/+$/, "");
   return `/${normalized}`;
 }
 function joinPath(baseDir, filename) {
@@ -16358,6 +16364,12 @@ function deriveKey(password, salt) {
   return crypto.pbkdf2Sync(password, salt, PBKDF2_ITERATIONS, KEY_LENGTH, "sha256");
 }
 function encryptApiKey(apiKey, password) {
+  if (typeof apiKey !== "string") {
+    throw new Error("API Key \u7F3A\u5931\u6216\u7C7B\u578B\u9519\u8BEF\uFF0C\u65E0\u6CD5\u52A0\u5BC6");
+  }
+  if (!password) {
+    throw new Error("\u540C\u6B65\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A");
+  }
   const salt = crypto.randomBytes(SALT_LENGTH);
   const iv = crypto.randomBytes(IV_LENGTH);
   const key = deriveKey(password, salt);
@@ -16386,10 +16398,15 @@ function decryptApiKey(encryptedApiKey, password) {
   }
 }
 function encryptProviders(providers, password) {
-  return providers.map((provider) => ({
-    ...provider,
-    apiKey: encryptApiKey(provider.apiKey, password)
-  }));
+  return providers.map((provider) => {
+    if (typeof provider.apiKey !== "string" || provider.apiKey.length === 0) {
+      throw new Error(`\u670D\u52A1\u5546 "${provider.name}" \u7684 API Key \u4E3A\u7A7A\u6216\u7F3A\u5931\uFF0C\u8BF7\u5148\u5728 ccman \u4E2D\u8865\u5168\u540E\u518D\u8FDB\u884C\u540C\u6B65`);
+    }
+    return {
+      ...provider,
+      apiKey: encryptApiKey(provider.apiKey, password)
+    };
+  });
 }
 function decryptProviders(encryptedProviders, password) {
   return encryptedProviders.map((provider) => ({
@@ -17240,55 +17257,63 @@ function configCommand(program2) {
           return;
         }
       }
-      const newConfig = { ...existingConfig };
+      let newConfig;
+      if (existingConfig) {
+        newConfig = { ...existingConfig };
+      } else {
+        if (!trimmedAnswers.webdavUrl) {
+          throw new Error("WebDAV \u5730\u5740\u4E0D\u80FD\u4E3A\u7A7A");
+        }
+        if (!trimmedAnswers.username) {
+          throw new Error("\u7528\u6237\u540D\u4E0D\u80FD\u4E3A\u7A7A");
+        }
+        if (!trimmedAnswers.password) {
+          throw new Error("\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A");
+        }
+        if (!trimmedAnswers.syncPassword) {
+          throw new Error("\u540C\u6B65\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A");
+        }
+        newConfig = {
+          webdavUrl: trimmedAnswers.webdavUrl,
+          username: trimmedAnswers.username,
+          password: trimmedAnswers.password,
+          authType: trimmedAnswers.authType,
+          remoteDir: trimmedAnswers.remoteDir || "/",
+          syncPassword: trimmedAnswers.syncPassword,
+          rememberSyncPassword: trimmedAnswers.rememberSyncPassword,
+          lastSync: void 0
+        };
+      }
       let hasChanges = false;
-      if (trimmedAnswers.webdavUrl) {
-        if (trimmedAnswers.webdavUrl !== existingConfig?.webdavUrl) {
+      if (existingConfig) {
+        if (trimmedAnswers.webdavUrl && trimmedAnswers.webdavUrl !== existingConfig.webdavUrl) {
           newConfig.webdavUrl = trimmedAnswers.webdavUrl;
           hasChanges = true;
         }
-      } else if (!existingConfig) {
-        throw new Error("WebDAV \u5730\u5740\u4E0D\u80FD\u4E3A\u7A7A");
-      }
-      if (trimmedAnswers.username) {
-        if (trimmedAnswers.username !== existingConfig?.username) {
+        if (trimmedAnswers.username && trimmedAnswers.username !== existingConfig.username) {
           newConfig.username = trimmedAnswers.username;
           hasChanges = true;
         }
-      } else if (!existingConfig) {
-        throw new Error("\u7528\u6237\u540D\u4E0D\u80FD\u4E3A\u7A7A");
-      }
-      if (trimmedAnswers.password) {
-        if (trimmedAnswers.password !== existingConfig?.password) {
+        if (trimmedAnswers.password && trimmedAnswers.password !== existingConfig.password) {
           newConfig.password = trimmedAnswers.password;
           hasChanges = true;
         }
-      } else if (!existingConfig) {
-        throw new Error("\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A");
-      }
-      if (trimmedAnswers.authType !== existingConfig?.authType) {
-        newConfig.authType = trimmedAnswers.authType;
-        hasChanges = true;
-      }
-      if (trimmedAnswers.remoteDir) {
-        if (trimmedAnswers.remoteDir !== existingConfig?.remoteDir) {
+        if (trimmedAnswers.authType !== existingConfig.authType) {
+          newConfig.authType = trimmedAnswers.authType;
+          hasChanges = true;
+        }
+        if (trimmedAnswers.remoteDir && trimmedAnswers.remoteDir !== existingConfig.remoteDir) {
           newConfig.remoteDir = trimmedAnswers.remoteDir;
           hasChanges = true;
         }
-      } else if (!existingConfig) {
-        newConfig.remoteDir = "/";
-      }
-      if (trimmedAnswers.syncPassword) {
-        if (trimmedAnswers.syncPassword !== existingConfig?.syncPassword) {
+        if (trimmedAnswers.syncPassword && trimmedAnswers.syncPassword !== existingConfig.syncPassword) {
           newConfig.syncPassword = trimmedAnswers.syncPassword;
           hasChanges = true;
         }
-      } else if (!existingConfig) {
-        throw new Error("\u540C\u6B65\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A");
-      }
-      if (trimmedAnswers.rememberSyncPassword !== existingConfig?.rememberSyncPassword) {
-        newConfig.rememberSyncPassword = trimmedAnswers.rememberSyncPassword;
-        hasChanges = true;
+        if (trimmedAnswers.rememberSyncPassword !== existingConfig.rememberSyncPassword) {
+          newConfig.rememberSyncPassword = trimmedAnswers.rememberSyncPassword;
+          hasChanges = true;
+        }
       }
       if (!hasChanges && existingConfig) {
         console.log();
@@ -17446,7 +17471,7 @@ function uploadCommand(program2) {
         console.log(import_chalk6.default.gray("\n\u5DF2\u53D6\u6D88\n"));
         return;
       }
-      let syncPassword = config.syncPassword;
+      let syncPassword = config.syncPassword || "";
       if (!syncPassword) {
         const { password } = await import_inquirer3.default.prompt([
           {
@@ -17525,7 +17550,7 @@ function downloadCommand(program2) {
         console.log(import_chalk7.default.gray("\n\u5DF2\u53D6\u6D88\n"));
         return;
       }
-      let syncPassword = config.syncPassword;
+      let syncPassword = config.syncPassword || "";
       if (!syncPassword) {
         const { password } = await import_inquirer4.default.prompt([
           {
@@ -17600,7 +17625,7 @@ function mergeCommand(program2) {
         console.log(import_chalk8.default.gray("\n\u5DF2\u53D6\u6D88\n"));
         return;
       }
-      let syncPassword = config.syncPassword;
+      let syncPassword = config.syncPassword || "";
       if (!syncPassword) {
         const { password } = await import_inquirer5.default.prompt([
           {
@@ -17870,6 +17895,10 @@ function formatProviderTable(providers, currentId) {
     lines.push(`  ${marker}  ${name}${tag}`);
     const url = isCurrent ? import_chalk2.default.green(p.baseUrl) : import_chalk2.default.gray(p.baseUrl);
     lines.push(`     ${url}`);
+    if (p.desc) {
+      const desc = isCurrent ? import_chalk2.default.green(p.desc) : import_chalk2.default.gray(p.desc);
+      lines.push(`     ${desc}`);
+    }
     if (index < providers.length - 1) {
       lines.push("");
     }
@@ -17891,6 +17920,12 @@ async function promptProviderForm(defaults2) {
         return true;
       }
     },
+    {
+      type: "input",
+      name: "desc",
+      message: "\u63CF\u8FF0(\u53EF\u9009):",
+      default: defaults2?.desc || void 0
+    },
     {
       type: "input",
       name: "baseUrl",
@@ -17918,6 +17953,7 @@ async function promptProviderForm(defaults2) {
   ]);
   return {
     name: answers.name,
+    desc: answers.desc || void 0,
     baseUrl: answers.baseUrl,
     apiKey: answers.apiKey
   };
@@ -18046,6 +18082,7 @@ async function handleAdd(tool) {
     }
   ]);
   let name;
+  let desc;
   let baseUrl;
   let apiKey;
   if (usePreset) {
@@ -18066,10 +18103,12 @@ async function handleAdd(tool) {
 `));
     const input = await promptProviderForm({
       name: preset.name,
+      desc: "",
       baseUrl: preset.baseUrl,
       apiKey: ""
     });
     name = input.name;
+    desc = input.desc;
     baseUrl = input.baseUrl;
     apiKey = input.apiKey;
   } else {
@@ -18101,10 +18140,11 @@ async function handleAdd(tool) {
       }
     ]);
     name = answers.name;
+    desc = void 0;
     baseUrl = answers.baseUrl;
     apiKey = answers.apiKey;
   }
-  const provider = manager.add({ name, baseUrl, apiKey });
+  const provider = manager.add({ name, desc, baseUrl, apiKey });
   console.log();
   console.log(import_chalk11.default.green("\u2705 \u6DFB\u52A0\u6210\u529F"));
   console.log();
@@ -18123,8 +18163,10 @@ async function handleAdd(tool) {
     manager.switch(provider.id);
     console.log(import_chalk11.default.green("\u2705 \u5DF2\u5207\u6362\u5230\u65B0\u670D\u52A1\u5546\n"));
   } else {
-    console.log(import_chalk11.default.blue("\u{1F4A1} \u7A0D\u540E\u5207\u6362:") + import_chalk11.default.white(` ccman ${tool === "codex" ? "cx" : "cc"} use "${provider.name}"
-`));
+    console.log(
+      import_chalk11.default.blue("\u{1F4A1} \u7A0D\u540E\u5207\u6362:") + import_chalk11.default.white(` ccman ${tool === "codex" ? "cx" : "cc"} use "${provider.name}"
+`)
+    );
   }
 }
 async function handleSwitch(tool) {
@@ -18165,7 +18207,7 @@ async function handleList(tool) {
   }
   console.log(import_chalk11.default.bold(`
 \u{1F4CB} ${toolName} \u670D\u52A1\u5546 (${providers.length} \u4E2A)`));
-  console.log(formatProviderTable(providers, current?.id, toolName));
+  console.log(formatProviderTable(providers, current?.id));
 }
 async function handleCurrent(tool) {
   const manager = tool === "codex" ? createCodexManager() : createClaudeManager();
@@ -18228,6 +18270,12 @@ async function handleEdit(tool) {
         return true;
       }
     },
+    {
+      type: "input",
+      name: "desc",
+      message: "\u63CF\u8FF0(\u53EF\u9009):",
+      default: provider.desc || ""
+    },
     {
       type: "password",
       name: "apiKey",
@@ -18237,6 +18285,7 @@ async function handleEdit(tool) {
   ]);
   manager.edit(providerId, {
     name: answers.name,
+    desc: answers.desc || void 0,
     baseUrl: answers.baseUrl,
     apiKey: answers.apiKey || void 0
   });
@@ -18279,6 +18328,8 @@ async function handleClone(tool) {
   ]);
   const newProvider = manager.add({
     name: answers.name,
+    // 克隆时不继承描述,留空让用户后续编辑
+    desc: void 0,
     baseUrl: provider.baseUrl,
     apiKey: answers.apiKey
   });
@@ -18342,6 +18393,7 @@ function addCommand(program2) {
         }
       ]);
       let name;
+      let desc;
       let baseUrl;
       let apiKey;
       if (usePreset) {
@@ -18362,10 +18414,12 @@ function addCommand(program2) {
 `));
         const input = await promptProviderForm({
           name: preset.name,
+          desc: "",
           baseUrl: preset.baseUrl,
           apiKey: ""
         });
         name = input.name;
+        desc = input.desc;
         baseUrl = input.baseUrl;
         apiKey = input.apiKey;
       } else {
@@ -18403,10 +18457,11 @@ function addCommand(program2) {
           }
         ]);
         name = answers.name;
+        desc = void 0;
         baseUrl = answers.baseUrl;
         apiKey = answers.apiKey;
       }
-      const provider = manager.add({ name, baseUrl, apiKey });
+      const provider = manager.add({ name, desc, baseUrl, apiKey });
       console.log();
       console.log(import_chalk12.default.green("\u2705 \u6DFB\u52A0\u6210\u529F"));
       console.log();
@@ -18456,7 +18511,7 @@ function listCommand(program2) {
       }
       console.log(import_chalk13.default.bold(`
 \u{1F4CB} Codex \u670D\u52A1\u5546 (${providers.length} \u4E2A)`));
-      console.log(formatProviderTable(providers, current?.id, "Codex"));
+      console.log(formatProviderTable(providers, current?.id));
     } catch (error) {
       console.error(import_chalk13.default.red(`
 \u274C ${error.message}
@@ -18762,6 +18817,8 @@ function cloneCommand(program2) {
 `));
         const input = await promptProviderForm({
           name: `${source.name}\uFF08\u526F\u672C\uFF09`,
+          // 克隆时不继承描述
+          desc: "",
           baseUrl: source.baseUrl,
           apiKey: source.apiKey
         });
@@ -18815,6 +18872,7 @@ function addCommand2(program2) {
         }
       ]);
       let name;
+      let desc;
       let baseUrl;
       let apiKey;
       if (usePreset) {
@@ -18835,10 +18893,12 @@ function addCommand2(program2) {
 `));
         const input = await promptProviderForm({
           name: preset.name,
+          desc: "",
           baseUrl: preset.baseUrl,
           apiKey: ""
         });
         name = input.name;
+        desc = input.desc;
         baseUrl = input.baseUrl;
         apiKey = input.apiKey;
       } else {
@@ -18876,10 +18936,11 @@ function addCommand2(program2) {
           }
         ]);
         name = answers.name;
+        desc = void 0;
         baseUrl = answers.baseUrl;
         apiKey = answers.apiKey;
       }
-      const provider = manager.add({ name, baseUrl, apiKey });
+      const provider = manager.add({ name, desc, baseUrl, apiKey });
       console.log();
       console.log(import_chalk19.default.green("\u2705 \u6DFB\u52A0\u6210\u529F"));
       console.log();
@@ -18928,7 +18989,7 @@ function listCommand2(program2) {
       }
       console.log(import_chalk20.default.bold(`
 \u{1F4CB} Claude Code \u670D\u52A1\u5546 (${providers.length} \u4E2A)`));
-      console.log(formatProviderTable(providers, current?.id, "Claude Code"));
+      console.log(formatProviderTable(providers, current?.id));
     } catch (error) {
       console.error(import_chalk20.default.red(`
 \u274C ${error.message}
@@ -19233,6 +19294,8 @@ function cloneCommand2(program2) {
 `));
         const input = await promptProviderForm({
           name: `${source.name}\uFF08\u526F\u672C\uFF09`,
+          // 克隆时不继承描述
+          desc: "",
           baseUrl: source.baseUrl,
           apiKey: source.apiKey
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccman",
-  "version": "3.0.26",
+  "version": "3.0.28",
   "description": "Manage Codex and Claude Code API service provider configurations",
   "main": "./dist/index.js",
   "bin": {