Fix: Optimize message sending logic

Author: ShenKSPZ

src/components/chat/ChatMessageArea.tsx

@@ -19,7 +19,7 @@ interface ChatMessageAreaProps {
   activeConversation: Conversation | null;
   isLoading: boolean;
   error: string | null;
-  onSendMessage: (content: string) => void;
+  onSendMessage: (content: string, files?: File[]) => void;
   onSendMessageWithFiles?: (content: string, files: File[]) => void;
   onStopStreaming?: () => void;
   onRegenerateResponse?: (messageId: string) => void;
@@ -126,10 +126,12 @@ export const ChatMessageArea: React.FC<ChatMessageAreaProps> = ({
     e.preventDefault();
     if (isLoading || isCurrentlyStreaming || !inputValue.trim()) return;
 
-    if (selectedFiles.length > 0 && onSendMessageWithFiles) {
-      onSendMessageWithFiles(inputValue, selectedFiles);
+    if (selectedFiles.length > 0) {
+      // Use the combined method with files parameter
+      onSendMessage(inputValue, selectedFiles);
       setSelectedFiles([]);
     } else {
+      // Use the combined method without files
       onSendMessage(inputValue);
     }
 

src/components/pages/ChatPage.tsx

@@ -224,35 +224,22 @@ export const ChatPage = () => {
   };
 
   // Handle sending a message with streaming
-  const handleSendMessage = async (content: string) => {
+  const handleSendMessage = async (content: string, files?: File[]) => {
     if (!activeConversationId || !isServiceInitialized || !chatServiceRef.current) return;
 
     try {
       const chatService = chatServiceRef.current;
 
-      // Check if there are selected MCP servers to use
-      if (selectedMcpServers.length > 0) {
-        // Send message with MCP tools
-        await chatService.sendMessageWithMCPTools(
-          content,
-          activeConversationId,
-          selectedMcpServers,
-          true,
-          (updatedConversation) => {
-            setConversations(updatedConversation);
-          }
-        );
-      } else {
-        // Send regular message
-        await chatService.sendMessage(
-          content, 
-          activeConversationId,
-          true,
-          (updatedConversation) => {
-            setConversations(updatedConversation);
-          }
-        );
-      }
+      // Send message with optional files
+      await chatService.sendMessage(
+        content, 
+        activeConversationId,
+        true,
+        (updatedConversation) => {
+          setConversations(updatedConversation);
+        },
+        files
+      );
     } catch (err) {
       console.error('Error sending streaming message:', err);
     }
@@ -375,27 +362,10 @@ export const ChatPage = () => {
     }
   };
 
-  // Handle sending a message with files
+  // Handle sending a message with files (deprecated - now handled by handleSendMessage)
+  // This method is kept for backward compatibility but delegates to handleSendMessage
   const handleSendMessageWithFiles = async (content: string, files: File[]) => {
-    if (!activeConversationId || !isServiceInitialized || !chatServiceRef.current) return;
-    
-    try {
-      const chatService = chatServiceRef.current;
-
-      // Send user message with files
-      await chatService.sendMessageWithFiles(
-        content, 
-        files,
-        activeConversationId,
-        true,
-        (updatedConversation) => {
-          setConversations(updatedConversation);
-        }
-      );
-      
-    } catch (err) {
-      console.error('Error sending message with files:', err);
-    }
+    await handleSendMessage(content, files);
   };
 
   // Toggle selection of an MCP server

src/services/ai-service.ts

@@ -3,9 +3,7 @@ import { ProviderFactory } from './providers/provider-factory';
 import { Message } from '../types/chat';
 import { StreamControlHandler } from './streaming-control';
 import { SETTINGS_CHANGE_EVENT, SettingsService } from './settings-service';
-import { MCPToolAdapter } from './mcp-tool-adapter';
 import { MCPService } from './mcp-service';
-import { AIServiceCapability } from '../types/capabilities';
 
 export interface ModelOption {
   id: string;
@@ -188,9 +186,6 @@ export class AIService {
       const modelName = options.model;
       const useStreaming = options.stream;
 
-      // Check if there are any MCP tools to be used
-      const mcpTools = options.mcpTools;
-      
       // Get provider instance
       const provider = this.getProvider(providerName);
 
@@ -200,36 +195,6 @@ export class AIService {
         throw new Error(`Provider ${providerName} not available`);
       }
 
-      // Check if the selected model supports tool calls
-      const modelCapabilities = provider.getModelCapabilities(modelName);
-      const supportsTools = modelCapabilities.includes(AIServiceCapability.ToolUsage) || 
-                            modelCapabilities.includes(AIServiceCapability.FunctionCalling) ||
-                            modelCapabilities.includes(AIServiceCapability.MCPServer);
-      
-      // If MCP tools are specified and model supports tools, get them and add to options
-      if (mcpTools && mcpTools.length > 0 && supportsTools) {
-        const mcpToolAdapter = MCPToolAdapter.getInstance();
-        const allTools: Record<string, unknown> = {};
-        
-        for (const mcpToolId of mcpTools) {
-          try {
-            const tools = await mcpToolAdapter.getToolsForServer(mcpToolId, streamController);
-            Object.assign(allTools, tools);
-          } catch (error) {
-            console.error(`Error loading tools for MCP server ${mcpToolId}:`, error);
-            // Continue with other tools if one fails
-          }
-        }
-        
-        // Add tools to options if any were loaded
-        if (Object.keys(allTools).length > 0) {
-          console.log('Adding tools to request:', Object.keys(allTools));
-          options.tools = allTools;
-        }
-      } else if (mcpTools && mcpTools.length > 0 && !supportsTools) {
-        console.warn(`Model ${modelName} does not support tools, but tools were requested`);
-      }
-      
       const result = await provider.getChatCompletion(
         messages, 
         {