fix: use apiKeys[provider] for model loading and API; prefer new format, deprecate apiKey

- Merge global and project apiKeys so keys are not lost when merging configs
- Resolve credentials from apiKeys.<provider> first; legacy apiKey fallback kept
- Add gemini-2.0-flash for Timeweb; update README and setup hints

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: prod-broke-again

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [1.0.31] - 2026-02-20
+
+### 🐛 Исправления
+- **Загрузка моделей по ключу провайдера** — модели и запросы к API используют ключ из `apiKeys.<provider>` (новый формат); ключи глобального и проектного конфига объединяются, чтобы не теряться при слиянии
+- Рекомендуется использовать только `apiKeys.gptunnel`, `apiKeys.timeweb` и т.д.; старый `apiKey` оставлен для обратной совместимости
+
+### ✨ Новые возможности
+- Модель **gemini-2.0-flash** для провайдера Timeweb
+
+### 🔧 Улучшения
+- В подсказке `smart-commit setup` приоритет у `apiKeys.<provider>`, старый формат помечен как legacy
+- README обновлён: примеры с apiKeys.gptunnel, baseUrls.timeweb для Timeweb
+
 ## [1.0.18] - 2025-12-02
 
 ### 🐛 Исправления

README.md

@@ -10,21 +10,21 @@ Global AI-powered tool for generating meaningful commit messages and running sma
 
 ## ⚠️ Important Configuration Update
 
-**Version 1.0.13** introduces support for multiple API keys for different providers and project-specific settings.
+Use **`apiKeys.<provider>`** for API keys. Each provider has its own key; model loading and API calls use the key for the current `defaultProvider`.
 
-- ⚠️ **`apiKey` is deprecated** — use `apiKeys` to store keys for different providers
-- ✅ **New feature**: Store keys for all providers simultaneously (`apiKeys.openai`, `apiKeys.timeweb`, etc.)
-- ✅ **Project settings**: Each project can have its own `apiKey`, `defaultProvider`, and `defaultModel`
-- ✅ **New provider**: Timeweb AI support added
+- ✅ **Recommended**: `apiKeys.gptunnel`, `apiKeys.timeweb`, `apiKeys.openai`, etc.
+- ⚠️ **Legacy**: `apiKey` (gptunnel only) is still supported but deprecated.
+- ✅ **Project settings**: Each project can have its own `apiKey`, `defaultProvider`, and `defaultModel`.
 
 ```bash
-# Old way (still works, but deprecated)
-smart-commit config --global --set apiKey=YOUR_KEY
-
-# New way (recommended)
+# Recommended (per-provider keys)
+smart-commit config --global --set apiKeys.gptunnel=YOUR_GPTUNNEL_KEY
+smart-commit config --global --set apiKeys.timeweb=YOUR_TIMEWEB_KEY
 smart-commit config --global --set apiKeys.openai=sk-...
-smart-commit config --global --set apiKeys.timeweb=tw-...
-smart-commit config --global --set apiKeys.anthropic=sk-ant-...
+
+# Set default provider and model
+smart-commit config --global --set defaultProvider=timeweb
+smart-commit config --global --set defaultModel=gemini-2.0-flash
 ```
 
 ## 🔗 Links
@@ -108,13 +108,19 @@ Continue? [y/N]
 All settings can be stored globally (`~/.smart-commit/config.json`) or per-project (`.smart-commit.json`).
 
 ```bash
-# Set API keys for different providers (recommended)
-smart-commit config --global --set apiKeys.openai=sk-...
+# Set API keys per provider (recommended)
+smart-commit config --global --set apiKeys.gptunnel=shds-...
 smart-commit config --global --set apiKeys.timeweb=tw-...
-smart-commit config --global --set apiKeys.anthropic=sk-ant-...
+smart-commit config --global --set apiKeys.openai=sk-...
+
+# Timeweb: also set base URL for your agent (required to avoid 404)
+smart-commit config --global --set baseUrls.timeweb=https://agent.timeweb.cloud/api/v1/cloud-ai/agents/YOUR_AGENT_ID/v1
+
+# Set default provider and model
+smart-commit config --global --set defaultProvider=timeweb
+smart-commit config --global --set defaultModel=gemini-2.0-flash
 
-# Set project-specific settings (overrides global)
-smart-commit config --set apiKey=project-key
+# Project-specific overrides
 smart-commit config --set defaultProvider=timeweb
 smart-commit config --set defaultModel=gpt-4o-mini
 
@@ -177,5 +183,4 @@ Smart Commit is released under the [MIT License](LICENSE).
 
 ---
 
-Made with ❤️ by [Eugene (prod-broke-again)](https://github.com/prod-broke-again)  
-Version: 1.0.14
+Made with ❤️ by [Eugene (prod-broke-again)](https://github.com/prod-broke-again)

package-lock.json

@@ -504,11 +504,11 @@ export class SmartCommitCli {
       console.log();
 
       // In a real implementation, you might use readline for interactive input
-      console.log(chalk.cyan('Run the following command to set your API key:'));
-      console.log(chalk.green('smart-commit config --global --set apiKey=YOUR_API_KEY'));
-      console.log(chalk.green('  or for specific provider:'));
-      console.log(chalk.green('smart-commit config --global --set apiKeys.openai=YOUR_OPENAI_KEY'));
+      console.log(chalk.cyan('Run the following command to set your API key (prefer apiKeys.<provider>):'));
+      console.log(chalk.green('smart-commit config --global --set apiKeys.gptunnel=YOUR_GPTUNNEL_KEY'));
       console.log(chalk.green('smart-commit config --global --set apiKeys.timeweb=YOUR_TIMEWEB_KEY'));
+      console.log(chalk.green('smart-commit config --global --set apiKeys.openai=YOUR_OPENAI_KEY'));
+      console.log(chalk.gray('  (legacy: apiKey=... for gptunnel only)'));
       console.log();
     } else {
       console.log(chalk.green('✓ API key is configured'));

src/cli/SmartCommitCli.ts

@@ -138,6 +138,7 @@ export class AiModel {
   public static readonly TIMEWEB_GPT_4O_MINI = AiModel.create('gpt-4o-mini', 'timeweb', 128000, 0.7, true);
   public static readonly TIMEWEB_GPT_3_5_TURBO = AiModel.create('gpt-3.5-turbo', 'timeweb', 16385, 0.7, true);
   public static readonly TIMEWEB_GEMINI_2_5_FLASH = AiModel.create('gemini-2.5-flash', 'timeweb', 1000000, 0.7, true);
+  public static readonly TIMEWEB_GEMINI_2_FLASH = AiModel.create('gemini-2.0-flash', 'timeweb', 1000000, 0.7, true);
 
   private static readonly DEFAULT_MODELS: Record<string, readonly AiModel[]> = Object.freeze({
     gptunnel: Object.freeze([
@@ -167,6 +168,7 @@ export class AiModel {
         AiModel.TIMEWEB_GPT_4O_MINI,
         AiModel.TIMEWEB_GPT_3_5_TURBO,
         AiModel.TIMEWEB_GEMINI_2_5_FLASH,
+        AiModel.TIMEWEB_GEMINI_2_FLASH,
       ]),
   });
 

src/domain/entities/AiModel.ts

@@ -76,17 +76,20 @@ export class ConfigFileManager implements IConfigurationManager {
     // Determine model: project config overrides global
     const model = projectConfig.defaultModel ?? globalConfig.defaultModel;
 
-    // Find API key with priority: project apiKey > global apiKeys[provider] > global apiKey (backward compatibility)
-    let apiKey: string | null = null;
-    
-    if (projectConfig.apiKey) {
-      // Project-specific key takes highest priority
-      apiKey = projectConfig.apiKey;
-    } else if (globalConfig.apiKeys && globalConfig.apiKeys[provider]) {
-      // Use key from apiKeys map for the specific provider
-      apiKey = globalConfig.apiKeys[provider];
-    } else if (globalConfig.apiKey) {
-      // Fallback to old apiKey field for backward compatibility
+    // Merged apiKeys: global + project (project overrides), so keys are never lost when merging configs
+    const projectApiKeys = (projectConfig as unknown as Record<string, unknown>)['apiKeys'];
+    const mergedApiKeys: Record<string, string> = {
+      ...(globalConfig.apiKeys || {}),
+      ...(projectApiKeys && typeof projectApiKeys === 'object' && !Array.isArray(projectApiKeys)
+        ? (projectApiKeys as Record<string, string>)
+        : {}),
+    };
+
+    // Resolve API key: project apiKey > apiKeys[provider] > deprecated global apiKey
+    let apiKey: string | null =
+      projectConfig.apiKey ?? mergedApiKeys[provider] ?? null;
+    if (apiKey === null && globalConfig.apiKey) {
+      // Deprecated: prefer apiKeys.<provider> (e.g. apiKeys.gptunnel)
       apiKey = globalConfig.apiKey;
     }
 
@@ -103,14 +106,15 @@ export class ConfigFileManager implements IConfigurationManager {
       aiModel = AiModel.create(model, provider, 400000, 0.7);
     }
 
-    // Merge configs (project overrides global)
+    // Merge configs (project overrides global); keep merged apiKeys so keys are never lost
     const merged: MergedConfig = {
       ...globalConfig,
       ...projectConfig,
       defaultProvider: provider,
       defaultModel: model,
       apiCredentials,
       aiModel,
+      apiKeys: mergedApiKeys,
     };
 
     return merged;