feat: 重构日志系统，引入统一的 logger 工具

Dango233 · aider-chat-bot · Dango233 · commit ee2641e10609 · 2025-07-03T23:00:51.000+08:00
Co-authored-by: aider (gemini/gemini-2.5-pro) &lt;aider@aider.chat&gt;
diff --git a/packages/mcp-server/src/bridge/bridge.ts b/packages/mcp-server/src/bridge/bridge.ts
@@ -21,15 +21,7 @@ import {
   type Content,
 } from '@google/genai';
 import { randomUUID } from 'node:crypto';
-
-const LOG_PREFIX = '[MCP SERVER]';
-
-const requestLogger = (debugMode: boolean) => (req: Request, res: Response, next: NextFunction) => {
-  if (debugMode) {
-    console.log(`${LOG_PREFIX} ${req.method} ${req.url}`);
-  }
-  next();
-};
+import { logger } from '../utils/logger.js';
 
 export class GcliMcpBridge {
   private readonly config: Config;
@@ -62,11 +54,6 @@ export class GcliMcpBridge {
   }
 
   public async start(app: Application) {
-
-    if (this.debugMode) {
-      app.use(requestLogger(this.debugMode));
-    }
-
     app.all('/mcp', async (req: Request, res: Response) => {
       const sessionId = req.headers['mcp-session-id'] as string | undefined;
 
@@ -75,23 +62,21 @@ export class GcliMcpBridge {
 
       if (!session) {
         if (isInitializeRequest(req.body)) {
-          if (this.debugMode) {
-            console.log(
-              `${LOG_PREFIX} Creating new session and transport for initialize request`,
-            );
-          }
+          logger.debug(
+            this.debugMode,
+            'Creating new session and transport for initialize request',
+          );
 
           try {
             // **修改 6: 为新会话创建独立的 McpServer 和 Transport**
             const newMcpServer = await this.createNewMcpServer();
             const newTransport = new StreamableHTTPServerTransport({
               sessionIdGenerator: () => randomUUID(),
-              onsessioninitialized: (newSessionId) => {
-                if (this.debugMode) {
-                  console.log(
-                    `${LOG_PREFIX} Session initialized: ${newSessionId}`,
-                  );
-                }
+              onsessioninitialized: newSessionId => {
+                logger.debug(
+                  this.debugMode,
+                  `Session initialized: ${newSessionId}`,
+                );
                 // 存储新的会话对象
                 this.sessions[newSessionId] = {
                   mcpServer: newMcpServer,
@@ -103,11 +88,10 @@ export class GcliMcpBridge {
             newTransport.onclose = () => {
               const sid = newTransport.sessionId;
               if (sid && this.sessions[sid]) {
-                if (this.debugMode) {
-                  console.log(
-                    `${LOG_PREFIX} Session ${sid} closed, removing session object.`,
-                  );
-                }
+                logger.debug(
+                  this.debugMode,
+                  `Session ${sid} closed, removing session object.`,
+                );
                 delete this.sessions[sid];
               }
             };
@@ -118,15 +102,15 @@ export class GcliMcpBridge {
             session = { mcpServer: newMcpServer, transport: newTransport };
           } catch (e) {
             // Handle errors during server creation
-            console.error(`${LOG_PREFIX} Error creating new MCP session:`, e);
+            logger.error('Error creating new MCP session:', e);
             if (!res.headersSent) {
               res.status(500).json({ error: 'Failed to create session' });
             }
             return;
           }
         } else {
-          console.error(
-            `${LOG_PREFIX} Bad Request: Missing session ID for non-initialize request.`,
+          logger.error(
+            'Bad Request: Missing session ID for non-initialize request.',
           );
           res.status(400).json({
             jsonrpc: '2.0',
@@ -138,17 +122,18 @@ export class GcliMcpBridge {
           });
           return;
         }
-      } else if (this.debugMode) {
-        console.log(
-          `${LOG_PREFIX} Reusing transport and server for session: ${sessionId}`,
+      } else {
+        logger.debug(
+          this.debugMode,
+          `Reusing transport and server for session: ${sessionId}`,
         );
       }
 
       try {
         // **修改 7: 使用会话特定的 transport 来处理请求**
         await session.transport.handleRequest(req, res, req.body);
       } catch (e) {
-        console.error(`${LOG_PREFIX} Error handling request:`, e);
+        logger.error('Error handling request:', e);
         if (!res.headersSent) {
           res.status(500).end();
         }
@@ -173,11 +158,10 @@ export class GcliMcpBridge {
 
       // 如果为这些工具设置了专用的模型，则创建一个新的配置和工具实例
       if (toolModel) {
-        if (this.debugMode) {
-          console.log(
-            `[MCP SERVER] Using custom model "${toolModel}" for tool "${tool.name}"`,
-          );
-        }
+        logger.debug(
+          this.debugMode,
+          `Using custom model "${toolModel}" for tool "${tool.name}"`,
+        );
 
         // 步骤 1: 创建一个 this.config 的代理。
         // 这个代理对象会拦截对 getModel 方法的调用。
@@ -212,22 +196,29 @@ export class GcliMcpBridge {
         args: Record<string, unknown>,
         extra: { signal: AbortSignal },
       ) => {
+        const startTime = Date.now();
+        logger.info('MCP tool call started', { toolName: tool.name, args });
         try {
           // *** 关键：现在所有工具都通过这个统一的路径执行 ***
           // toolInstanceForExecution 要么是原始工具，要么是带有自定义模型配置的新实例
           const result = await toolInstanceForExecution.execute(
             args,
             extra.signal,
           );
+          const durationMs = Date.now() - startTime;
+          logger.info('MCP tool call finished', {
+            toolName: tool.name,
+            status: 'success',
+            durationMs,
+          });
           return this.convertGcliResultToMcpResult(result);
         } catch (e) {
-          const errorMessage = e instanceof Error ? e.message : String(e);
-          console.error(
-            `${LOG_PREFIX} Error executing tool '${tool.name}': ${errorMessage}`,
-          );
-          throw new Error(
-            `Error executing tool '${tool.name}': ${errorMessage}`,
-          );
+          const durationMs = Date.now() - startTime;
+          logger.error('MCP tool call failed', e as Error, {
+            toolName: tool.name,
+            durationMs,
+          });
+          throw e; // 重新抛出错误，让 MCP SDK 处理
         }
       },
     );
diff --git a/packages/mcp-server/src/bridge/openai.ts b/packages/mcp-server/src/bridge/openai.ts
@@ -4,19 +4,30 @@ import { createOpenAIStreamTransformer } from './stream-transformer.js';
 import { GeminiApiClient } from '../gemini-client.js'; // <-- 引入新类
 import { type OpenAIChatCompletionRequest } from '../types.js'; // <-- 引入新类型
 import { mapErrorToOpenAIError } from '../utils/error-mapper.js';
+import { logger } from '../utils/logger.js';
+import { randomUUID } from 'node:crypto';
 
 export function createOpenAIRouter(config: Config, debugMode = false): Router {
   const router = Router();
 
+  // 中间件：为每个请求添加 requestId
+  router.use((req, res, next) => {
+    (req as any).requestId = randomUUID();
+    next();
+  });
+
   router.post('/chat/completions', async (req: Request, res: Response) => {
+    const requestId = (req as any).requestId;
+    const startTime = Date.now();
     try {
       const body = req.body as OpenAIChatCompletionRequest;
-      if (debugMode) {
-        console.log(
-          '[OpenAI Bridge] Received /chat/completions request:',
-          JSON.stringify(body, null, 2),
-        );
-      }
+
+      logger.info('OpenAI bridge request received', {
+        requestId,
+        model: body.model,
+        stream: body.stream,
+      });
+      logger.debug(debugMode, 'Request body:', { requestId, body });
       const stream = body.stream !== false;
 
       if (!stream) {
@@ -75,9 +86,19 @@ export function createOpenAIRouter(config: Config, debugMode = false): Router {
       }
       // --- 修正结束 ---
 
+      const durationMs = Date.now() - startTime;
+      logger.info('OpenAI bridge request finished', {
+        requestId,
+        status: 'success',
+        durationMs,
+      });
       res.end();
     } catch (e: unknown) {
-      console.error('[OpenAI Bridge] Error:', e);
+      const durationMs = Date.now() - startTime;
+      logger.error('OpenAI bridge request failed', e as Error, {
+        requestId,
+        durationMs,
+      });
 
       // 调用新的错误映射函数
       const { openAIError, statusCode } = mapErrorToOpenAIError(e);
diff --git a/packages/mcp-server/src/gemini-client.ts b/packages/mcp-server/src/gemini-client.ts
@@ -20,6 +20,7 @@ import {
   type StreamChunk,
   type ReasoningData,
 } from './types.js';
+import { logger } from './utils/logger.js';
 
 /**
  * Recursively removes fields from a JSON schema that are not supported by the
@@ -140,8 +141,11 @@ export class GeminiApiClient {
                 },
               });
             } catch (e) {
-              console.error(
-                '[GeminiApiClient] Error parsing tool call arguments:',
+              logger.warn(
+                'Failed to parse tool call arguments',
+                {
+                  arguments: toolCall.function.arguments,
+                },
                 e,
               );
             }
@@ -238,22 +242,14 @@ export class GeminiApiClient {
   }): Promise<AsyncGenerator<StreamChunk>> {
     const history = messages.map(msg => this.openAIMessageToGemini(msg));
     const lastMessage = history.pop();
-    
-    // Always show the model being used
-    console.log(`[GeminiApiClient] Using model: ${model}`);
-    
-    // Only show detailed history in debug mode
-    if (this.debugMode) {
-      console.log(
-        '[GeminiApiClient] History:',
-        JSON.stringify(history, null, 2),
-      );
-      console.log(
-        '[GeminiApiClient] Last Message:',
-        JSON.stringify(lastMessage, null, 2),
-      );
-    }
-    
+
+    logger.info('Calling Gemini API', { model });
+
+    logger.debug(this.debugMode, 'Sending request to Gemini', {
+      historyLength: history.length,
+      lastMessage,
+    });
+
     if (!lastMessage) {
       throw new Error('No message to send.');
     }
@@ -291,10 +287,8 @@ export class GeminiApiClient {
       },
     });
 
-    if (this.debugMode) {
-      console.log('[GeminiApiClient] Got stream from Gemini.');
-    }
-    
+    logger.debug(this.debugMode, 'Got stream from Gemini.');
+
     // Transform the event stream to a simpler StreamChunk stream
     return (async function* (): AsyncGenerator<StreamChunk> {
       for await (const response of geminiStream) {
diff --git a/packages/mcp-server/src/index.ts b/packages/mcp-server/src/index.ts
@@ -16,12 +16,7 @@ import { loadServerConfig } from './config/config.js';
 import { GcliMcpBridge } from './bridge/bridge.js';
 import { createOpenAIRouter } from './bridge/openai.js';
 import express from 'express';
-
-// Simple console logger for now
-const logger = {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  warn: (...args: any[]) => console.warn('[WARN]', ...args),
-};
+import { logger } from './utils/logger.js';
 
 function mergeMcpServers(
   settings: Settings,
@@ -64,11 +59,13 @@ async function startMcpServer() {
   const debugMode = args.includes('--debug');
 
   if (isNaN(port)) {
-    console.error('Invalid port number provided. Use --port=<number> or set GEMINI_MCP_PORT environment variable.');
+    logger.error(
+      'Invalid port number provided. Use --port=<number> or set GEMINI_MCP_PORT environment variable.',
+    );
     process.exit(1);
   }
 
-  console.log('🚀 Starting Gemini CLI MCP Server...');
+  logger.info('Starting Gemini CLI MCP Server...');
 
   // 2. 复用配置加载的核心部分，但手动构造 Config
   const workspaceRoot = process.cwd();
@@ -86,19 +83,17 @@ async function startMcpServer() {
   // Initialize Auth - this is critical to initialize the tool registry and gemini client
   let selectedAuthType = settings.merged.selectedAuthType;
   if (!selectedAuthType && !process.env.GEMINI_API_KEY) {
-    console.error(
+    logger.error(
       'Auth missing: Please set `selectedAuthType` in .gemini/settings.json or set the GEMINI_API_KEY environment variable.',
     );
     process.exit(1);
   }
   selectedAuthType = selectedAuthType || AuthType.USE_GEMINI;
   await config.refreshAuth(selectedAuthType);
-  if (debugMode) {
-    console.log(`Using authentication method: ${selectedAuthType}`);
-  }
+  logger.debug(debugMode, `Using authentication method: ${selectedAuthType}`);
 
   // Log the model being used for tools. This is now set in loadServerConfig.
-  console.log(`⚙️  Using model for tools: ${config.getModel()}`);
+  logger.debug(debugMode, `Using model for tools: ${config.getModel()}`);
 
   // 4. 初始化并启动 MCP 桥接服务 和 OpenAI 服务
   const mcpBridge = new GcliMcpBridge(config, cliVersion, debugMode);
@@ -114,17 +109,15 @@ async function startMcpServer() {
   app.use('/v1', openAIRouter);
 
   app.listen(port, () => {
-    console.log(
-      `🚀 Gemini CLI MCP Server and OpenAI Bridge are running on port ${port}`,
-    );
-    console.log(`   - MCP transport listening on http://localhost:${port}/mcp`);
-    console.log(
-      `   - OpenAI-compatible endpoints available at http://localhost:${port}/v1`,
-    );
+    logger.info('Server running', {
+      port,
+      mcpUrl: `http://localhost:${port}/mcp`,
+      openAIUrl: `http://localhost:${port}/v1`,
+    });
   });
 }
 
 startMcpServer().catch(error => {
-  console.error('Failed to start Gemini CLI MCP Bridge:', error);
+  logger.error('Failed to start Gemini CLI MCP Bridge:', error);
   process.exit(1);
 });
diff --git a/packages/mcp-server/src/utils/logger.ts b/packages/mcp-server/src/utils/logger.ts
