ccman 3.0.20 → 3.0.21

package/dist/index.js

@@ -39,7 +39,7 @@ var init_package = __esm({
   "../core/package.json"() {
     package_default = {
       name: "@ccman/core",
-      version: "3.0.20",
+      version: "3.0.21",
       type: "module",
       description: "Core business logic for ccman",
       main: "./dist/index.js",
@@ -2357,20 +2357,20 @@ var init_claude2 = __esm({
 });
 
 // ../core/dist/tool-manager.js
-function generateId(tool) {
-  const timestamp = Date.now();
-  const random = Math.random().toString(36).substring(2, 8);
-  return `${tool}-${timestamp}-${random}`;
-}
-function createCodexManager() {
-  const configPath = path3.join(getCcmanDir(), "codex.json");
+function createToolManager(tool) {
+  const toolConfig = TOOL_CONFIGS[tool];
+  const configPath = toolConfig.configPath;
+  function generateId() {
+    const timestamp = Date.now();
+    const random = Math.random().toString(36).substring(2, 8);
+    return `${tool}-${timestamp}-${random}`;
+  }
   function loadConfig2() {
     if (!fileExists(configPath)) {
       ensureDir(getCcmanDir());
       const initialConfig = {
         providers: [],
         presets: []
-        // 只存储用户自定义预置
       };
       writeJSON(configPath, initialConfig);
       return initialConfig;
@@ -2389,12 +2389,11 @@ function createCodexManager() {
       }
       const timestamp = Date.now();
       const provider = {
-        id: generateId("codex"),
+        id: generateId(),
         name: input.name,
         baseUrl: input.baseUrl,
         apiKey: input.apiKey,
         model: input.model,
-        // 保存 model 字段
         createdAt: timestamp,
         lastModified: timestamp
       };
@@ -2428,7 +2427,7 @@ function createCodexManager() {
       config.currentProviderId = id;
       provider.lastUsedAt = Date.now();
       saveConfig2(config);
-      writeCodexConfig(provider);
+      toolConfig.writer(provider);
     },
     getCurrent() {
       const config = loadConfig2();
@@ -2461,7 +2460,7 @@ function createCodexManager() {
       provider.lastModified = Date.now();
       saveConfig2(config);
       if (config.currentProviderId === id) {
-        writeCodexConfig(provider);
+        toolConfig.writer(provider);
       }
       return provider;
     },
@@ -2487,7 +2486,7 @@ function createCodexManager() {
       const timestamp = Date.now();
       const newProvider = {
         ...source,
-        id: generateId("codex"),
+        id: generateId(),
         name: newName,
         createdAt: timestamp,
         lastModified: timestamp,
@@ -2502,7 +2501,7 @@ function createCodexManager() {
       if (!config.presets) {
         config.presets = [];
       }
-      const allPresets = [...CODEX_PRESETS, ...config.presets];
+      const allPresets = [...toolConfig.builtinPresets, ...config.presets];
       const nameExists = allPresets.some((p) => p.name === input.name);
       if (nameExists) {
         throw new PresetNameConflictError(input.name);
@@ -2514,12 +2513,23 @@ function createCodexManager() {
       };
       config.presets.push(preset);
       saveConfig2(config);
-      return preset;
+      return {
+        ...preset,
+        isBuiltIn: false
+      };
     },
     listPresets() {
       const config = loadConfig2();
       const userPresets = config.presets || [];
-      return [...CODEX_PRESETS, ...userPresets];
+      const builtinWithFlag = toolConfig.builtinPresets.map((p) => ({
+        ...p,
+        isBuiltIn: true
+      }));
+      const userWithFlag = userPresets.map((p) => ({
+        ...p,
+        isBuiltIn: false
+      }));
+      return [...builtinWithFlag, ...userWithFlag];
     },
     editPreset(name, updates) {
       const config = loadConfig2();
@@ -2531,7 +2541,7 @@ function createCodexManager() {
         throw new Error(`\u9884\u7F6E\u4E0D\u5B58\u5728: ${name}`);
       }
       if (updates.name !== void 0 && updates.name !== preset.name) {
-        const allPresets = [...CODEX_PRESETS, ...config.presets];
+        const allPresets = [...toolConfig.builtinPresets, ...config.presets];
         const nameConflict = allPresets.some((p) => p.name !== name && p.name === updates.name);
         if (nameConflict) {
           throw new PresetNameConflictError(updates.name);
@@ -2544,7 +2554,10 @@ function createCodexManager() {
       if (updates.description !== void 0)
         preset.description = updates.description;
       saveConfig2(config);
-      return preset;
+      return {
+        ...preset,
+        isBuiltIn: false
+      };
     },
     removePreset(name) {
       const config = loadConfig2();
@@ -2560,201 +2573,13 @@ function createCodexManager() {
     }
   };
 }
+function createCodexManager() {
+  return createToolManager("codex");
+}
 function createClaudeManager() {
-  const configPath = path3.join(getCcmanDir(), "claude.json");
-  function loadConfig2() {
-    if (!fileExists(configPath)) {
-      ensureDir(getCcmanDir());
-      const initialConfig = {
-        providers: [],
-        presets: []
-        // 只存储用户自定义预置
-      };
-      writeJSON(configPath, initialConfig);
-      return initialConfig;
-    }
-    return readJSON(configPath);
-  }
-  function saveConfig2(config) {
-    writeJSON(configPath, config);
-  }
-  return {
-    add(input) {
-      const config = loadConfig2();
-      const nameExists = config.providers.some((p) => p.name === input.name);
-      if (nameExists) {
-        throw new ProviderNameConflictError(input.name);
-      }
-      const timestamp = Date.now();
-      const provider = {
-        id: generateId("claude"),
-        name: input.name,
-        baseUrl: input.baseUrl,
-        apiKey: input.apiKey,
-        createdAt: timestamp,
-        lastModified: timestamp
-      };
-      config.providers.push(provider);
-      saveConfig2(config);
-      return provider;
-    },
-    list() {
-      const config = loadConfig2();
-      return config.providers;
-    },
-    get(id) {
-      const config = loadConfig2();
-      const provider = config.providers.find((p) => p.id === id);
-      if (!provider) {
-        throw new ProviderNotFoundError(id);
-      }
-      return provider;
-    },
-    findByName(name) {
-      const config = loadConfig2();
-      const lowerName = name.toLowerCase();
-      return config.providers.find((p) => p.name.toLowerCase() === lowerName);
-    },
-    switch(id) {
-      const config = loadConfig2();
-      const provider = config.providers.find((p) => p.id === id);
-      if (!provider) {
-        throw new ProviderNotFoundError(id);
-      }
-      config.currentProviderId = id;
-      provider.lastUsedAt = Date.now();
-      saveConfig2(config);
-      writeClaudeConfig(provider);
-    },
-    getCurrent() {
-      const config = loadConfig2();
-      if (!config.currentProviderId) {
-        return null;
-      }
-      const provider = config.providers.find((p) => p.id === config.currentProviderId);
-      return provider || null;
-    },
-    edit(id, updates) {
-      const config = loadConfig2();
-      const provider = config.providers.find((p) => p.id === id);
-      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 (nameConflict) {
-          throw new ProviderNameConflictError(updates.name);
-        }
-      }
-      if (updates.name !== void 0)
-        provider.name = updates.name;
-      if (updates.baseUrl !== void 0)
-        provider.baseUrl = updates.baseUrl;
-      if (updates.apiKey !== void 0)
-        provider.apiKey = updates.apiKey;
-      provider.lastModified = Date.now();
-      saveConfig2(config);
-      if (config.currentProviderId === id) {
-        writeClaudeConfig(provider);
-      }
-      return provider;
-    },
-    remove(id) {
-      const config = loadConfig2();
-      const index = config.providers.findIndex((p) => p.id === id);
-      if (index === -1) {
-        throw new ProviderNotFoundError(id);
-      }
-      if (config.currentProviderId === id) {
-        config.currentProviderId = void 0;
-      }
-      config.providers.splice(index, 1);
-      saveConfig2(config);
-    },
-    clone(sourceId, newName) {
-      const source = this.get(sourceId);
-      const config = loadConfig2();
-      const nameExists = config.providers.some((p) => p.name === newName);
-      if (nameExists) {
-        throw new ProviderNameConflictError(newName);
-      }
-      const timestamp = Date.now();
-      const newProvider = {
-        ...source,
-        id: generateId("claude"),
-        name: newName,
-        createdAt: timestamp,
-        lastModified: timestamp,
-        lastUsedAt: void 0
-      };
-      config.providers.push(newProvider);
-      saveConfig2(config);
-      return newProvider;
-    },
-    addPreset(input) {
-      const config = loadConfig2();
-      if (!config.presets) {
-        config.presets = [];
-      }
-      const allPresets = [...CC_PRESETS, ...config.presets];
-      const nameExists = allPresets.some((p) => p.name === input.name);
-      if (nameExists) {
-        throw new PresetNameConflictError(input.name);
-      }
-      const preset = {
-        name: input.name,
-        baseUrl: input.baseUrl,
-        description: input.description
-      };
-      config.presets.push(preset);
-      saveConfig2(config);
-      return preset;
-    },
-    listPresets() {
-      const config = loadConfig2();
-      const userPresets = config.presets || [];
-      return [...CC_PRESETS, ...userPresets];
-    },
-    editPreset(name, updates) {
-      const config = loadConfig2();
-      if (!config.presets) {
-        config.presets = [];
-      }
-      const preset = config.presets.find((p) => p.name === name);
-      if (!preset) {
-        throw new Error(`\u9884\u7F6E\u4E0D\u5B58\u5728: ${name}`);
-      }
-      if (updates.name !== void 0 && updates.name !== preset.name) {
-        const allPresets = [...CC_PRESETS, ...config.presets];
-        const nameConflict = allPresets.some((p) => p.name !== name && p.name === updates.name);
-        if (nameConflict) {
-          throw new PresetNameConflictError(updates.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;
-      saveConfig2(config);
-      return preset;
-    },
-    removePreset(name) {
-      const config = loadConfig2();
-      if (!config.presets) {
-        return;
-      }
-      const index = config.presets.findIndex((p) => p.name === name);
-      if (index === -1) {
-        throw new Error(`Preset not found: ${name}`);
-      }
-      config.presets.splice(index, 1);
-      saveConfig2(config);
-    }
-  };
+  return createToolManager("claude");
 }
-var path3, ProviderNotFoundError, ProviderNameConflictError, PresetNameConflictError;
+var path3, ProviderNotFoundError, ProviderNameConflictError, PresetNameConflictError, TOOL_CONFIGS;
 var init_tool_manager = __esm({
   "../core/dist/tool-manager.js"() {
     "use strict";
@@ -2783,6 +2608,18 @@ var init_tool_manager = __esm({
         this.name = "PresetNameConflictError";
       }
     };
+    TOOL_CONFIGS = {
+      codex: {
+        configPath: path3.join(getCcmanDir(), "codex.json"),
+        builtinPresets: CODEX_PRESETS,
+        writer: writeCodexConfig
+      },
+      claude: {
+        configPath: path3.join(getCcmanDir(), "claude.json"),
+        builtinPresets: CC_PRESETS,
+        writer: writeClaudeConfig
+      }
+    };
   }
 });
 

package/package.json

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