refactor: 修复 SDK 导入错误并改进错误处理

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

Author: Dango233

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

@@ -1,5 +1,6 @@
 import express, { Request, Response, NextFunction, Application } from 'express';
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+// [FIX] Correctly import 'Server' and 'JSONRPCError' from the SDK's server entry point.
+import { Server, JSONRPCError } from '@modelcontextprotocol/sdk/server/index.js';
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import { z } from 'zod';
 import {
@@ -39,12 +40,14 @@ const requestLogger = (req: Request, res: Response, next: NextFunction) => {
 export class GcliMcpBridge {
   private readonly config: Config;
   private readonly cliVersion: string;
-  private readonly mcpServer: McpServer;
+  // [FIX] Use the correct class name 'Server'
+  private readonly mcpServer: Server;
 
   constructor(config: Config, cliVersion: string) {
     this.config = config;
     this.cliVersion = cliVersion;
-    this.mcpServer = new McpServer(
+    // [FIX] Instantiate the correct class 'Server'
+    this.mcpServer = new Server(
       {
         name: 'gemini-cli-mcp-server',
         version: this.cliVersion,
@@ -141,9 +144,32 @@ export class GcliMcpBridge {
         description: tool.description,
         inputSchema: inputSchema,
       },
-      async (args, extra) => {
-        const result = await tool.execute(args, extra.signal);
-        return this.convertGcliResultToMcpResult(result);
+      // [FIX] Add explicit types for args and extra, and implement the try/catch block.
+      async (
+        args: Record<string, unknown>,
+        extra: { signal: AbortSignal },
+      ) => {
+        try {
+          const result = await tool.execute(args, extra.signal);
+          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,
+          );
+
+          const userFacingMessage = `Error executing tool '${tool.name}': Quota exceeded. Do not retry. Upstream error: ${errorMessage}`;
+
+          throw new JSONRPCError(
+            -32000,
+            userFacingMessage,
+            {
+              toolName: tool.name,
+              originalError: errorMessage,
+            },
+          );
+        }
       },
     );
   }

packages/mcp-server/src/bridge/openai.ts

@@ -66,10 +66,40 @@ export function createOpenAIRouter(config: Config): Router {
       console.error('[OpenAI Bridge] Error:', error);
       const errorMessage =
         error instanceof Error ? error.message : 'An unknown error occurred';
+
+      // [MODIFICATION] 检查错误类型并设置适当的状态码
+      let statusCode = 500; // 默认为内部服务器错误
+      if (error instanceof Error) {
+        // 检查 gaxios 或类似 HTTP 客户端可能附加的 status 属性
+        const status = (error as any).status;
+        if (status === 429) {
+          statusCode = 429;
+        } else if (typeof status === 'number' && status >= 400 && status < 500) {
+          statusCode = status;
+        }
+        // 也可以通过检查消息内容来增加健壮性
+        else if (
+          errorMessage.includes('429') ||
+          errorMessage.toLowerCase().includes('quota')
+        ) {
+          statusCode = 429;
+        }
+      }
+
       if (!res.headersSent) {
-        res.status(500).json({ error: errorMessage });
+        // 使用动态的状态码
+        res.status(statusCode).json({
+          error: {
+            message: errorMessage,
+            type: 'gemini_api_error',
+            code: statusCode, // 在响应体中也反映出来
+          },
+        });
       } else {
-        res.write(`data: ${JSON.stringify({ error: errorMessage })}\n\n`);
+        // 如果流已经开始，我们无法改变状态码，但可以在流中发送错误
+        res.write(
+          `data: ${JSON.stringify({ error: errorMessage, code: statusCode })}\n\n`,
+        );
         res.end();
       }
     }