@opensumi/ide-ai-native 3.9.1-next-1748523870.0 → 3.9.1-next-1748593694.0

package/src/browser/components/ChatToolRender.tsx

@@ -7,6 +7,7 @@ import { Loading } from '@opensumi/ide-core-browser/lib/components/ai-native';
 import { IChatToolContent, uuid } from '@opensumi/ide-core-common';
 import { localize } from '@opensumi/ide-core-common/lib/localize';
 
+import { TOOL_NAME_SEPARATOR } from '../../common/utils';
 import { IMCPServerRegistry, TokenMCPServerRegistry } from '../types';
 
 import { CodeEditorWithHighlight } from './ChatEditor';
@@ -21,7 +22,9 @@ export const ChatToolRender = (props: { value: IChatToolContent['content']; mess
   if (!value || !value.function || !value.id) {
     return null;
   }
-  const label = mcpServerFeatureRegistry.getMCPTool(value.function.name)?.label || value.function.name;
+  const toolName = mcpServerFeatureRegistry.getMCPTool(value.function.name)?.label || value.function.name;
+  const parts = toolName.split(TOOL_NAME_SEPARATOR);
+  const label = parts.length >= 3 ? parts[2] : toolName;
 
   const ToolComponent = mcpServerFeatureRegistry.getToolComponent(value.function.name);
 
@@ -72,7 +75,12 @@ export const ChatToolRender = (props: { value: IChatToolContent['content']; mess
         <div className={styles.tool_name}>
           <Icon iconClass={`codicon codicon-chevron-${isExpanded ? 'down' : 'right'}`} />
           <Icon size='small' iconClass={cls('codicon codicon-tools', styles.tool_icon)} />
-          <span className={styles.tool_label}>{label}</span>
+          <span className={styles.tool_label}>
+            <span className={styles.tool_prefix}>Called MCP Tool</span>
+            <span className={styles.tool_name} title={label}>
+              {label}
+            </span>
+          </span>
         </div>
         {value.state && (
           <div className={styles.tool_state}>

package/src/browser/layout/ai-layout.tsx

@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react';
 
-import { SlotRenderer, useInjectable } from '@opensumi/ide-core-browser';
+import { SlotLocation, SlotRenderer, useInjectable } from '@opensumi/ide-core-browser';
 import { BoxPanel, SplitPanel, getStorageValue } from '@opensumi/ide-core-browser/lib/components';
 import { DesignLayoutConfig } from '@opensumi/ide-core-browser/lib/layout/constants';
 
@@ -32,9 +32,9 @@ export const AILayout = () => {
           resizeHandleClassName={'design-slot_resize_horizontal'}
         >
           <SlotRenderer
-            slot='left'
+            slot={SlotLocation.view}
             isTabbar={true}
-            defaultSize={layout.left?.currentId ? layout.left?.size || 310 : 49}
+            defaultSize={layout[SlotLocation.view]?.currentId ? layout[SlotLocation.view]?.size || 310 : 49}
             minResize={280}
             minSize={49}
           />
@@ -42,16 +42,20 @@ export const AILayout = () => {
             <SlotRenderer flex={2} flexGrow={1} minResize={200} slot='main' />
             <SlotRenderer
               flex={1}
-              defaultSize={layout.bottom?.currentId ? layout.bottom?.size : 24}
+              defaultSize={layout[SlotLocation.panel]?.currentId ? layout[SlotLocation.panel]?.size : 24}
               minResize={160}
-              slot='bottom'
+              slot={SlotLocation.panel}
               isTabbar={true}
             />
           </SplitPanel>
           <SlotRenderer
-            slot='right'
+            slot={SlotLocation.extendView}
             isTabbar={true}
-            defaultSize={layout.right?.currentId ? layout.right?.size || 360 : defaultRightSize}
+            defaultSize={
+              layout[SlotLocation.extendView]?.currentId
+                ? layout[SlotLocation.extendView]?.size || 360
+                : defaultRightSize
+            }
             minResize={280}
             minSize={defaultRightSize}
           />
@@ -59,7 +63,7 @@ export const AILayout = () => {
         <SlotRenderer
           slot={AI_CHAT_VIEW_ID}
           isTabbar={true}
-          defaultSize={layout.AI_Chat?.currentId ? layout.AI_Chat?.size || 360 : 0}
+          defaultSize={layout['AI-Chat']?.currentId ? layout['AI-Chat']?.size || 360 : 0}
           maxResize={420}
           minResize={280}
           minSize={0}

package/src/browser/layout/tabbar.view.tsx

@@ -1,5 +1,5 @@
 import cls from 'classnames';
-import React, { useCallback, useEffect, useMemo } from 'react';
+import React, { useCallback, useMemo } from 'react';
 
 import {
   ComponentRegistryInfo,
@@ -29,25 +29,18 @@ import {
   TabbarViewBase,
 } from '@opensumi/ide-main-layout/lib/browser/tabbar/bar.view';
 import { BaseTabPanelView, ContainerView } from '@opensumi/ide-main-layout/lib/browser/tabbar/panel.view';
-import { TabRendererBase, TabbarConfig } from '@opensumi/ide-main-layout/lib/browser/tabbar/renderer.view';
+import { TabRendererBase } from '@opensumi/ide-main-layout/lib/browser/tabbar/renderer.view';
 import { TabbarService, TabbarServiceFactory } from '@opensumi/ide-main-layout/lib/browser/tabbar/tabbar.service';
 
 import { AI_CHAT_VIEW_ID } from '../../common';
 
 import styles from './layout.module.less';
 
-const ChatTabbarRenderer: React.FC = () => {
-  const { side } = React.useContext(TabbarConfig);
-  const tabbarService: TabbarService = useInjectable(TabbarServiceFactory)(side);
-  useEffect(() => {
-    tabbarService.setIsLatter(true);
-  }, [tabbarService]);
-  return (
-    <div style={{ width: 0 }}>
-      <TabbarViewBase tabSize={0} MoreTabView={IconElipses} TabView={IconTabView} barSize={0} panelBorderSize={1} />
-    </div>
-  );
-};
+const ChatTabbarRenderer: React.FC = () => (
+  <div style={{ width: 0 }}>
+    <TabbarViewBase tabSize={0} MoreTabView={IconElipses} TabView={IconTabView} barSize={0} panelBorderSize={0} />
+  </div>
+);
 
 export const AIChatTabRenderer = ({
   className,
@@ -110,7 +103,7 @@ export const AILeftTabRenderer = ({
 const AILeftTabbarRenderer: React.FC = () => {
   const layoutService = useInjectable<IMainLayoutService>(IMainLayoutService);
 
-  const tabbarService: TabbarService = useInjectable(TabbarServiceFactory)(SlotLocation.right);
+  const tabbarService: TabbarService = useInjectable(TabbarServiceFactory)(SlotLocation.extendView);
   const currentContainerId = useAutorun(tabbarService.currentContainerId);
 
   const extraMenus = React.useMemo(() => layoutService.getExtraMenu(), [layoutService]);
@@ -154,14 +147,8 @@ const AILeftTabbarRenderer: React.FC = () => {
   );
 };
 
-export const AIRightTabRenderer = ({
-  className,
-  components,
-}: {
-  className: string;
-  components: ComponentRegistryInfo[];
-}) => {
-  const tabbarService: TabbarService = useInjectable(TabbarServiceFactory)(SlotLocation.right);
+export const AIRightTabRenderer = ({ components }: { className: string; components: ComponentRegistryInfo[] }) => {
+  const tabbarService: TabbarService = useInjectable(TabbarServiceFactory)(SlotLocation.extendView);
   const designLayoutConfig = useInjectable<DesignLayoutConfig>(DesignLayoutConfig);
 
   const handleClose = useCallback(() => {

package/src/browser/mcp/mcp-server-proxy.service.ts

@@ -5,7 +5,8 @@ import { ILogger } from '@opensumi/ide-core-browser';
 import { Emitter, Event } from '@opensumi/ide-core-common';
 
 import { BUILTIN_MCP_SERVER_NAME, ISumiMCPServerBackend, SumiMCPServerProxyServicePath } from '../../common';
-import { IMCPServerProxyService } from '../../common/types';
+import { ImageCompressionOptions, compressToolResultSmart } from '../../common/image-compression';
+import { IMCPServerProxyService, IMCPToolResult } from '../../common/types';
 import { IMCPServerRegistry, TokenMCPServerRegistry } from '../types';
 
 @Injectable()
@@ -64,4 +65,8 @@ export class MCPServerProxyService implements IMCPServerProxyService {
   async $stopServer(serverName: string) {
     await this.sumiMCPServerProxyService.$stopServer(serverName);
   }
+
+  async $compressToolResult(result: IMCPToolResult, options: ImageCompressionOptions) {
+    return compressToolResultSmart(result, options);
+  }
 }

package/src/browser/types.ts

@@ -5,7 +5,6 @@ import { ZodSchema } from 'zod';
 import { AIActionItem } from '@opensumi/ide-core-browser/lib/components/ai-native/index';
 import {
   CancellationToken,
-  ChatMessageRole,
   ChatResponse,
   Deferred,
   IAICompletionOption,
@@ -135,8 +134,6 @@ export interface IChatFeatureRegistry {
   registerImageUploadProvider(provider: IImageUploadProvider): void;
   registerWelcome(content: IChatWelcomeMessageContent | React.ReactNode, sampleQuestions?: ISampleQuestions[]): void;
   registerSlashCommand(command: IChatSlashCommandItem, handler: IChatSlashCommandHandler): void;
-
-  registerMessageSummaryProvider(provider: IMessageSummaryProvider): void;
 }
 
 export type ChatWelcomeRender = (props: {
@@ -301,15 +298,6 @@ export interface IImageUploadProvider {
   imageUpload(file: File): Promise<DataContent | URL>;
 }
 
-export interface IMessageSummaryProvider {
-  getMessageSummary(
-    messages: Array<{
-      role: ChatMessageRole;
-      content: string;
-    }>,
-  ): Promise<string | undefined>;
-}
-
 export const AINativeCoreContribution = Symbol('AINativeCoreContribution');
 
 export interface AINativeCoreContribution {

package/src/common/image-compression.ts

@@ -0,0 +1,174 @@
+import { isObject } from '@opensumi/ide-utils';
+
+import { IMCPToolResult, IMCPToolResultContent } from './types';
+
+export interface ImageCompressionOptions {
+  maxSizeKB?: number;
+  quality?: number;
+  maxWidth?: number;
+  maxHeight?: number;
+  mimeType?: string;
+}
+
+const DEFAULT_OPTIONS: Required<ImageCompressionOptions> = {
+  maxSizeKB: 500, // 500KB
+  quality: 0.8,
+  maxWidth: 1920,
+  maxHeight: 1080,
+  mimeType: 'image/jpeg',
+};
+
+/**
+ * 获取 base64 图像的大小（KB）
+ */
+export function getBase64ImageSize(base64String: string): number {
+  if (!base64String) {
+    return 0;
+  }
+
+  // 移除 data URL 前缀
+  const base64Data = base64String.split(',')[1] || base64String;
+
+  // Base64 编码后的大小约为原始大小的 4/3
+  const sizeInBytes = (base64Data.length * 3) / 4;
+  return sizeInBytes / 1024; // 转换为 KB
+}
+
+/**
+ * 使用 Canvas API 进行真正的图像压缩
+ */
+export function compressBase64Image(base64String: string, options: ImageCompressionOptions = {}): Promise<string> {
+  return new Promise((resolve) => {
+    try {
+      // 输入验证
+      if (!base64String || typeof base64String !== 'string') {
+        resolve(base64String || '');
+        return;
+      }
+      if (!base64String.startsWith('data:') && options.mimeType) {
+        base64String = `data:${options.mimeType};base64,${base64String}`;
+      }
+      const opts = { ...DEFAULT_OPTIONS, ...options };
+      const currentSize = getBase64ImageSize(base64String);
+      // 如果图像已经小于目标大小，直接返回
+      if (currentSize <= opts.maxSizeKB) {
+        resolve(base64String);
+        return;
+      }
+      // 创建图像对象
+      const img = new Image();
+      img.onload = () => {
+        try {
+          // 计算新的尺寸，保持宽高比
+          let { width, height } = img;
+          // 处理极小图片
+          if (width <= 1 || height <= 1) {
+            resolve(base64String);
+            return;
+          }
+          const aspectRatio = width / height;
+          if (width > opts.maxWidth) {
+            width = opts.maxWidth;
+            height = width / aspectRatio;
+          }
+          if (height > opts.maxHeight) {
+            height = opts.maxHeight;
+            width = height * aspectRatio;
+          }
+          const canvas = document.createElement('canvas');
+          const ctx = canvas.getContext('2d');
+          if (!ctx) {
+            resolve(base64String);
+            return;
+          }
+          canvas.width = Math.round(width);
+          canvas.height = Math.round(height);
+          ctx.drawImage(img, 0, 0, canvas.width, canvas.height);
+          let compressedBase64 = canvas.toDataURL(opts.mimeType, opts.quality);
+          let compressedSize = getBase64ImageSize(compressedBase64);
+          let currentQuality = opts.quality;
+          let attempts = 0;
+          const maxAttempts = 5;
+          while (compressedSize > opts.maxSizeKB && attempts < maxAttempts) {
+            currentQuality *= 0.6;
+            compressedBase64 = canvas.toDataURL(opts.mimeType, currentQuality);
+            compressedSize = getBase64ImageSize(compressedBase64);
+            attempts++;
+          }
+          const [, base64] = compressedBase64.split(',');
+          resolve(base64);
+        } catch (error) {
+          // 压缩失败，返回原始图像
+          resolve(base64String);
+        }
+      };
+      img.onerror = () => {
+        // 图像加载失败，返回原始字符串
+        resolve(base64String);
+      };
+      img.src = base64String;
+    } catch (error) {
+      resolve(base64String);
+    }
+  });
+}
+
+/**
+ * 压缩内容数组格式的工具结果
+ */
+export async function compressContentArrayResult(
+  result: IMCPToolResult,
+  options: ImageCompressionOptions = {},
+): Promise<IMCPToolResult> {
+  if (!result || !result.content || !Array.isArray(result.content)) {
+    return result;
+  }
+
+  const compressedContent = await Promise.all(
+    result.content.map(async (item) => {
+      if (item.type === 'image') {
+        let compressedData: string;
+        // 检测环境
+        if (typeof window !== 'undefined' && typeof document !== 'undefined') {
+          compressedData = await compressBase64Image(item.data, {
+            ...options,
+            mimeType: item.mimeType,
+          });
+        } else {
+          compressedData = item.data;
+        }
+
+        return {
+          ...item,
+          data: compressedData,
+        };
+      }
+      return item;
+    }),
+  );
+
+  return {
+    ...result,
+    content: compressedContent,
+  };
+}
+
+/**
+ * 智能压缩工具结果，支持多种格式
+ */
+export async function compressToolResultSmart(
+  result: IMCPToolResult,
+  options: ImageCompressionOptions = {},
+): Promise<any> {
+  if (
+    result &&
+    isObject(result) &&
+    result.content &&
+    Array.isArray(result.content) &&
+    result.content.some((item: IMCPToolResultContent) => item.type === 'image')
+  ) {
+    return await compressContentArrayResult(result, options);
+  }
+
+  return result;
+}

package/src/common/index.ts

@@ -15,8 +15,9 @@ import {
 import { DESIGN_MENUBAR_CONTAINER_VIEW_ID } from '@opensumi/ide-design/lib/common/constants';
 import { IPosition, ITextModel, InlineCompletionContext } from '@opensumi/ide-monaco/lib/common';
 
+import { ImageCompressionOptions } from './image-compression';
 import { IMCPServer, MCPServerDescription } from './mcp-server-manager';
-import { IPartialEditEvent, MCPTool } from './types';
+import { IMCPToolResult, IPartialEditEvent, MCPTool } from './types';
 
 import type { CoreMessage } from 'ai';
 
@@ -152,6 +153,7 @@ export interface ISumiMCPServerBackend {
   $removeServer(name: string): void;
   $syncServer(name: string): Promise<void>;
   $getMCPServerByName(name: string): IMCPServer | undefined;
+  $compressToolResult(result: IMCPToolResult, options: ImageCompressionOptions): Promise<IMCPToolResult>;
 }
 
 export const SumiMCPServerProxyServicePath = 'SumiMCPServerProxyServicePath';

package/src/common/types.ts

@@ -1,6 +1,8 @@
 import { IMarker } from '@opensumi/ide-core-browser';
 import { Uri } from '@opensumi/monaco-editor-core';
 
+import { ImageCompressionOptions } from './image-compression';
+
 export enum NearestCodeBlockType {
   Block = 'block',
   Line = 'line',
@@ -22,6 +24,12 @@ export interface INearestCodeBlock {
   type?: NearestCodeBlockType;
 }
 
+export type IMCPToolResultContent = { type: 'text'; text: string } | { type: 'image'; data: string; mimeType?: string };
+export interface IMCPToolResult {
+  content: IMCPToolResultContent[];
+  isError?: boolean;
+}
+
 // SUMI MCP Server 网页部分暴露给 Node.js 部分的能力
 export interface IMCPServerProxyService {
   $callMCPTool(
@@ -41,6 +49,8 @@ export interface IMCPServerProxyService {
   $startServer(serverName: string): Promise<void>;
   // 停止指定的 MCP 服务器
   $stopServer(serverName: string): Promise<void>;
+  // 压缩工具结果
+  $compressToolResult(result: IMCPToolResult, options: ImageCompressionOptions): Promise<IMCPToolResult>;
 }
 
 export interface MCPServer {

package/src/common/utils.ts

@@ -54,8 +54,11 @@ export const extractCodeBlocks = (content: string): string => {
 // 确保 Tool Name 符合 Claude 3.5+ Sonnet 要求的 ^[a-zA-Z0-9_-]{1,64}$ 正则
 export const toClaudeToolName = (name: string) => name.replace(/[^a-zA-Z0-9_-]/g, '').slice(0, 64);
 
+export const TOOL_NAME_SEPARATOR = '__';
 export const getToolName = (toolName: string, serverName: string) =>
-  serverName === BUILTIN_MCP_SERVER_NAME ? toolName : toClaudeToolName(`mcp_${serverName}_${toolName}`);
+  serverName === BUILTIN_MCP_SERVER_NAME
+    ? toolName
+    : toClaudeToolName(`mcp${TOOL_NAME_SEPARATOR}${serverName}${TOOL_NAME_SEPARATOR}${toolName}`);
 
 export const cleanAttachedTextWrapper = (text: string) => {
   const rgAttachedFile = /`<attached_file>(.*)`/g;

package/src/node/base-language-model.ts

@@ -1,20 +1,12 @@
-import {
-  CoreMessage,
-  CoreUserMessage,
-  ImagePart,
-  TextPart,
-  ToolExecutionOptions,
-  jsonSchema,
-  streamText,
-  tool,
-} from 'ai';
+import { CoreMessage, ImagePart, TextPart, ToolExecutionOptions, jsonSchema, streamText, tool } from 'ai';
 
 import { Autowired, Injectable } from '@opensumi/di';
 import { IAIBackServiceOption } from '@opensumi/ide-core-common';
-import { ChatReadableStream } from '@opensumi/ide-core-node';
+import { ChatReadableStream, INodeLogger } from '@opensumi/ide-core-node';
 import { CancellationToken } from '@opensumi/ide-utils';
 
 import { ModelInfo } from '../common';
+import { compressToolResultSmart, getBase64ImageSize } from '../common/image-compression';
 import {
   IToolInvocationRegistryManager,
   ToolInvocationRegistryManager,
@@ -28,6 +20,9 @@ export abstract class BaseLanguageModel {
   @Autowired(ToolInvocationRegistryManager)
   protected readonly toolInvocationRegistryManager: IToolInvocationRegistryManager;
 
+  @Autowired(INodeLogger)
+  protected readonly logger: INodeLogger;
+
   protected abstract initializeProvider(options: IAIBackServiceOption): any;
 
   async request(
@@ -67,8 +62,11 @@ export abstract class BaseLanguageModel {
       description: toolRequest.description || '',
       // TODO 这里应该是 z.object 而不是 JSON Schema
       parameters: jsonSchema(toolRequest.parameters),
-      execute: async (args: any, options: ToolExecutionOptions) =>
-        await toolRequest.handler(JSON.stringify(args), options),
+      execute: async (args: any, options: ToolExecutionOptions) => {
+        // 执行原始工具
+        const result = await toolRequest.handler(JSON.stringify(args), options);
+        return result;
+      },
     });
   }
 

package/src/node/mcp/sumi-mcp-server.ts

@@ -12,9 +12,10 @@ import { INodeLogger } from '@opensumi/ide-core-node';
 
 import pkg from '../../../package.json';
 import { BUILTIN_MCP_SERVER_NAME, ISumiMCPServerBackend } from '../../common';
+import { ImageCompressionOptions } from '../../common/image-compression';
 import { IMCPServer, MCPServerDescription } from '../../common/mcp-server-manager';
 import { IToolInvocationRegistryManager, ToolInvocationRegistryManager } from '../../common/tool-invocation-registry';
-import { IMCPServerProxyService, MCPTool, MCP_SERVER_TYPE } from '../../common/types';
+import { IMCPServerProxyService, IMCPToolResult, MCPTool, MCP_SERVER_TYPE } from '../../common/types';
 import { MCPServerManagerImpl } from '../mcp-server-manager-impl';
 import { SSEMCPServer } from '../mcp-server.sse';
 import { StdioMCPServer } from '../mcp-server.stdio';
@@ -43,7 +44,7 @@ export class SumiMCPServerBackend extends RPCService<IMCPServerProxyService> imp
 
   constructor() {
     super();
-    this.mcpServerManager = new MCPServerManagerImpl(this.toolInvocationRegistryManager, this.logger);
+    this.mcpServerManager = new MCPServerManagerImpl(this.toolInvocationRegistryManager, this.logger, this);
   }
 
   public setConnectionClientId(clientId: string) {
@@ -51,6 +52,13 @@ export class SumiMCPServerBackend extends RPCService<IMCPServerProxyService> imp
     this.mcpServerManager.setClientId(clientId);
   }
 
+  async $compressToolResult(result: IMCPToolResult, options: ImageCompressionOptions) {
+    if (!this.client) {
+      throw new Error('SUMI MCP RPC Client not initialized');
+    }
+    return this.client.$compressToolResult(result, options);
+  }
+
   async $getMCPTools() {
     if (!this.client) {
       throw new Error('SUMI MCP RPC Client not initialized');

package/src/node/mcp-server-manager-impl.ts

@@ -3,14 +3,16 @@ import { ToolExecutionOptions } from 'ai';
 import { ILogger } from '@opensumi/ide-core-common';
 import { getShellPath } from '@opensumi/ide-core-node';
 
+import { ISumiMCPServerBackend } from '../common';
 import { IMCPServer, MCPServerDescription, MCPServerManager, MCPTool } from '../common/mcp-server-manager';
 import { IToolInvocationRegistryManager, ToolRequest } from '../common/tool-invocation-registry';
-import { MCP_SERVER_TYPE } from '../common/types';
+import { IMCPToolResult, MCP_SERVER_TYPE } from '../common/types';
 import { getToolName } from '../common/utils';
 
 import { BuiltinMCPServer } from './mcp/sumi-mcp-server';
 import { SSEMCPServer } from './mcp-server.sse';
 import { StdioMCPServer } from './mcp-server.stdio';
+
 // 这应该是 Browser Tab 维度的，每个 Tab 对应一个 MCPServerManagerImpl
 export class MCPServerManagerImpl implements MCPServerManager {
   protected servers: Map<string, IMCPServer> = new Map();
@@ -27,6 +29,7 @@ export class MCPServerManagerImpl implements MCPServerManager {
   constructor(
     private readonly toolInvocationRegistryManager: IToolInvocationRegistryManager,
     private readonly logger: ILogger,
+    private readonly proxy: ISumiMCPServerBackend,
   ) {}
 
   async updateShellPath() {
@@ -110,7 +113,19 @@ export class MCPServerManagerImpl implements MCPServerManager {
           const res = await this.callTool(serverName, tool.name, options?.toolCallId || '', arg_string);
           this.logger.debug(`[MCP: ${serverName}] ${tool.name} called with ${arg_string}`);
           this.logger.debug('Tool execution result:', res);
-          return JSON.stringify(res);
+          let compressedResult: IMCPToolResult = res as IMCPToolResult;
+          if (
+            this.proxy?.$compressToolResult &&
+            (compressedResult.content || []).some((item) => item.type === 'image')
+          ) {
+            compressedResult = await this.proxy.$compressToolResult(res as IMCPToolResult, {
+              maxSizeKB: 100,
+              maxWidth: 600,
+              quality: 0.6,
+            });
+          }
+          this.logger.debug('Compressed tool execution result:', compressedResult);
+          return JSON.stringify(compressedResult);
         } catch (error) {
           this.logger.error(`Error in tool handler for ${tool.name} on MCP server ${serverName}:`, error);
           throw error;