fix: 修复 MCP 服务器忽略 GEMINI_TOOLS_DEFAULT_MODEL 的问题

Co-authored-by: aider (vertex_ai/gemini-2.5-pro) <aider@aider.chat>

Author: Dango233

packages/mcp-server/src/config/config.ts

@@ -93,6 +93,12 @@ export async function loadServerConfig(
 
   const sandboxConfig = await loadSandboxConfig(settings, {});
 
+  // Prioritize GEMINI_TOOLS_DEFAULT_MODEL, then GEMINI_MODEL, then the hardcoded default.
+  const model =
+    process.env.GEMINI_TOOLS_DEFAULT_MODEL ||
+    process.env.GEMINI_MODEL ||
+    DEFAULT_GEMINI_MODEL;
+
   return new Config({
     sessionId,
     embeddingModel: DEFAULT_GEMINI_EMBEDDING_MODEL,
@@ -136,7 +142,7 @@ export async function loadServerConfig(
     cwd: process.cwd(),
     fileDiscoveryService: fileService,
     bugCommand: settings.bugCommand,
-    model: process.env.GEMINI_MODEL || DEFAULT_GEMINI_MODEL,
+    model: model,
     extensionContextFilePaths,
   });
 }

packages/mcp-server/src/index.ts

@@ -97,15 +97,8 @@ async function startMcpServer() {
     console.log(`Using authentication method: ${selectedAuthType}`);
   }
 
-  // Check for the custom tools model environment variable
-  const toolsDefaultModel = process.env.GEMINI_TOOLS_DEFAULT_MODEL;
-  if (toolsDefaultModel && toolsDefaultModel.trim() !== '') {
-    config.setModel(toolsDefaultModel.trim());
-    console.log(`🚀 Using custom model for tools: ${toolsDefaultModel.trim()}`);
-  } else {
-    // Log the default model being used if the environment variable is not set
-    console.log(`⚙️  Using default model for tools: ${config.getModel()}`);
-  }
+  // Log the model being used for tools. This is now set in loadServerConfig.
+  console.log(`⚙️  Using model for tools: ${config.getModel()}`);
 
   // 4. 初始化并启动 MCP 桥接服务 和 OpenAI 服务
   const mcpBridge = new GcliMcpBridge(config, cliVersion, debugMode);