codemate-ai 1.0.6 → 1.0.7

package/dist/cli.js

@@ -384,10 +384,14 @@ var init_ConfigManager = __esm({
       constructor(options) {
         const { cwd, productName, argvConfig = {} } = options;
         const lowerProductName = productName.toLowerCase();
+        const legacyGlobalConfigPath = path18.join(homedir(), ".aiclirc.json");
         this.globalConfigPath = path18.join(homedir(), `.${lowerProductName}`, "config.json");
         this.projectConfigPath = path18.join(cwd, `.${lowerProductName}`, "config.json");
         const projectLocalConfigPath = path18.join(cwd, `.${lowerProductName}`, "config.local.json");
-        this.globalConfig = this.loadConfig(this.globalConfigPath);
+        this.globalConfig = defu(
+          this.loadConfig(this.globalConfigPath),
+          this.loadConfig(legacyGlobalConfigPath)
+        );
         this.projectConfig = defu(
           this.loadConfig(projectLocalConfigPath),
           // 优先级高
@@ -423,6 +427,7 @@ var init_ConfigManager = __esm({
             )
           )
         );
+        this.normalizeConfig(config);
         config.planModel = config.planModel || config.model;
         config.smallModel = config.smallModel || config.model;
         config.visionModel = config.visionModel || config.model;
@@ -485,6 +490,26 @@ var init_ConfigManager = __esm({
           return {};
         }
       }
+      normalizeConfig(config) {
+        const legacyModel = config.model;
+        if (!legacyModel || typeof legacyModel !== "object") {
+          return;
+        }
+        const modelName = typeof legacyModel.model === "string" ? legacyModel.model : "deepseek-chat";
+        const providerKey = config._metadata?.provider || "deepseek";
+        config.model = modelName;
+        if (!config.provider) {
+          config.provider = {};
+        }
+        const existingProvider = config.provider[providerKey] || {};
+        config.provider[providerKey] = {
+          apiKey: existingProvider.apiKey || legacyModel.apiKey,
+          baseURL: existingProvider.baseURL || legacyModel.baseURL
+        };
+        if (config.temperature === void 0 && legacyModel.temperature !== void 0) {
+          config.temperature = legacyModel.temperature;
+        }
+      }
       /**
        * 保存配置文件
        *
@@ -20916,12 +20941,72 @@ var ConfigService = class {
    */
   getModelConfig() {
     const config = this.getConfig();
+    const legacyModel = typeof config.model === "object" ? config.model : void 0;
+    const providerKey = this.getProviderKey(config) || "deepseek";
+    const providerConfig = config.provider?.[providerKey];
+    const envConfig = this.getProviderEnvConfig(providerKey);
     return {
-      apiKey: process.env.DEEPSEEK_API_KEY || "",
-      baseURL: process.env.DEEPSEEK_BASE_URL || "https://api.deepseek.com",
-      model: config.model || "deepseek-chat",
-      temperature: config.temperature || 0.7
+      apiKey: envConfig.apiKey || providerConfig?.apiKey || legacyModel?.apiKey || "",
+      baseURL: envConfig.baseURL || providerConfig?.baseURL || legacyModel?.baseURL || this.getDefaultBaseURL(providerKey),
+      model: (typeof config.model === "string" ? config.model : void 0) || legacyModel?.model || this.getDefaultModel(providerKey),
+      temperature: config.temperature ?? legacyModel?.temperature ?? 0.7
+    };
+  }
+  getProviderKey(config) {
+    const metadataProvider = config._metadata?.provider;
+    if (typeof metadataProvider === "string" && metadataProvider.trim()) {
+      return metadataProvider;
+    }
+    const providerKeys = config.provider ? Object.keys(config.provider) : [];
+    if (providerKeys.length === 1) {
+      return providerKeys[0];
+    }
+    return void 0;
+  }
+  getDefaultModel(providerKey) {
+    const defaults = {
+      openai: "gpt-4",
+      anthropic: "claude-3-5-sonnet-20241022",
+      deepseek: "deepseek-chat",
+      openrouter: "anthropic/claude-3.5-sonnet",
+      custom: "gpt-4"
+    };
+    return defaults[providerKey] || "deepseek-chat";
+  }
+  getDefaultBaseURL(providerKey) {
+    const defaults = {
+      openai: "https://api.openai.com/v1",
+      anthropic: "https://api.anthropic.com",
+      deepseek: "https://api.deepseek.com",
+      openrouter: "https://openrouter.ai/api/v1",
+      custom: "https://api.openai.com/v1"
     };
+    return defaults[providerKey] || "https://api.deepseek.com";
+  }
+  getProviderEnvConfig(providerKey) {
+    const envMap = {
+      openai: {
+        apiKey: process.env.OPENAI_API_KEY,
+        baseURL: process.env.OPENAI_BASE_URL
+      },
+      anthropic: {
+        apiKey: process.env.ANTHROPIC_API_KEY,
+        baseURL: process.env.ANTHROPIC_BASE_URL
+      },
+      deepseek: {
+        apiKey: process.env.DEEPSEEK_API_KEY,
+        baseURL: process.env.DEEPSEEK_BASE_URL
+      },
+      openrouter: {
+        apiKey: process.env.OPENROUTER_API_KEY,
+        baseURL: process.env.OPENROUTER_BASE_URL
+      },
+      custom: {
+        apiKey: process.env.OPENAI_API_KEY,
+        baseURL: process.env.OPENAI_BASE_URL
+      }
+    };
+    return envMap[providerKey] || {};
   }
   /**
    * 获取应用配置（向后兼容）
@@ -22182,11 +22267,20 @@ function AppContent() {
         try {
           modelService.updateConfig({ model: modelId });
           setCurrentModelId(modelId);
+          let missingApiKey = false;
+          let configPath = "~/.codemate/config.json";
           try {
             const configService = app.getContainer().get("config");
             if (configService && typeof configService.setConfig === "function") {
               configService.setConfig(false, "model", modelId);
             }
+            if (configService && typeof configService.getGlobalConfigPath === "function") {
+              configPath = configService.getGlobalConfigPath();
+            }
+            if (configService && typeof configService.getModelConfig === "function") {
+              const modelConfig = configService.getModelConfig();
+              missingApiKey = !modelConfig.apiKey;
+            }
           } catch (error) {
             console.log("ConfigService not available, model change is temporary");
           }
@@ -22194,7 +22288,7 @@ function AppContent() {
             role: "assistant",
             content: `\u2705 Model changed to ${modelId}
 
-\u{1F504} The model has been updated for this session. To make this change permanent, update your .aiclirc.json configuration file.`
+\u{1F504} The model has been updated for this session. To make this change permanent, update your ${configPath} configuration file.${missingApiKey ? "\n\n\u26A0\uFE0F No API key configured. Run `codemate config` or set the provider API key in the config file to use this model." : ""}`
           });
           const eventBus = app.getContainer().get("eventBus");
           eventBus.emit("model_changed", { newModel: modelId, previousModel: previousModelId });
@@ -22460,10 +22554,13 @@ function App({ app }) {
 // src/utils/firstRun.ts
 init_esm_shims();
 function isFirstRun() {
-  const configPath = getConfigPath();
-  return !fs21__default.existsSync(configPath);
+  return !fs21__default.existsSync(getConfigPath()) && !fs21__default.existsSync(getLegacyConfigPath());
 }
 function getConfigPath() {
+  const homeDir = os4__default.homedir();
+  return path18.join(homeDir, ".codemate", "config.json");
+}
+function getLegacyConfigPath() {
   const homeDir = os4__default.homedir();
   return path18.join(homeDir, ".aiclirc.json");
 }
@@ -22489,12 +22586,14 @@ function createDefaultConfig(apiKey, provider, model, baseURL) {
       logLevel: "info",
       workDir: process.cwd()
     },
-    model: {
-      apiKey,
-      baseURL: baseURL || defaultBaseURLs[provider] || "https://api.openai.com/v1",
-      model: model || defaultModels[provider] || "gpt-4",
-      temperature: 0.7
+    model: model || defaultModels[provider] || "gpt-4",
+    provider: {
+      [provider]: {
+        apiKey,
+        baseURL: baseURL || defaultBaseURLs[provider] || "https://api.openai.com/v1"
+      }
     },
+    temperature: 0.7,
     tools: {
       enabled: [
         "read_file",
@@ -22528,6 +22627,7 @@ function createDefaultConfig(apiKey, provider, model, baseURL) {
     }
   };
   const configPath = getConfigPath();
+  fs21__default.mkdirSync(path18.dirname(configPath), { recursive: true });
   fs21__default.writeFileSync(configPath, JSON.stringify(config, null, 2));
 }
 
@@ -22588,7 +22688,7 @@ async function runFirstTimeSetup() {
   rl.close();
   createDefaultConfig(apiKey.trim(), providerKey, model, baseURL || PROVIDERS[providerKey].baseURL);
   console.log("");
-  console.log("\u2705 \u914D\u7F6E\u5DF2\u4FDD\u5B58\u5230: ~/.aiclirc.json");
+  console.log("\u2705 \u914D\u7F6E\u5DF2\u4FDD\u5B58\u5230: ~/.codemate/config.json");
   console.log("");
   console.log(`\u63D0\u4F9B\u5546: ${PROVIDERS[providerKey].name}`);
   console.log(`\u6A21\u578B: ${model}`);
@@ -22656,7 +22756,7 @@ program.command("config").description("Configure or reconfigure CodeMate AI").ac
   try {
     console.log("\n\u{1F527} CodeMate AI \u914D\u7F6E\u5411\u5BFC\n");
     if (!isFirstRun()) {
-      console.log("\u5F53\u524D\u914D\u7F6E\u6587\u4EF6: ~/.aiclirc.json");
+      console.log("\u5F53\u524D\u914D\u7F6E\u6587\u4EF6: ~/.codemate/config.json");
       console.log("\u6B64\u64CD\u4F5C\u5C06\u8986\u76D6\u73B0\u6709\u914D\u7F6E\u3002\n");
     }
     await runFirstTimeSetup();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codemate-ai",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "type": "module",
   "description": "Enterprise-grade AI coding assistant CLI",
   "main": "dist/cli.js",