fix: 修复文件上传显示重复问题

- 使用 lastSentMessageWithFiles 判断避免重复显示
- 图片在前端直接显示预览（base64）
- 文本文件显示名称和内容摘要
- extra_data 保存图片/文件信息用于历史记录

main_v2.py

@@ -743,6 +743,7 @@ async def websocket_endpoint(websocket: WebSocket, user_id: str):
                                     "role": m.role,
                                     "content": m.content,
                                     "thinking_content": m.thinking_content,
+                                    "extra_data": m.extra_data,  # 包含搜索结果等
                                     "agent_id": m.agent_id,  # 每条消息的Agent ID
                                     "source": m.source,
                                     "created_at": m.created_at.isoformat()
@@ -765,6 +766,7 @@ async def websocket_endpoint(websocket: WebSocket, user_id: str):
                 
                 elif action == "chat":
                     message = data.get("message", "")
+                    files = data.get("files", [])  # 上传的文件
                     conversation_id = data.get("conversation_id")
                     enable_thinking = data.get("enable_thinking", True)
                     agent_id_override = data.get("agent_id")
@@ -775,9 +777,40 @@ async def websocket_endpoint(websocket: WebSocket, user_id: str):
                         if agent and agent.is_active:
                             current_agent_id = agent_id_override
                     
-                    if not message.strip():
+                    # 如果没有消息但有文件，构造消息
+                    if not message.strip() and files:
+                        message = "[上传文件]"
+                    
+                    if not message.strip() and not files:
                         continue
                     
+                    # 处理文件内容，添加到消息
+                    image_contents = []  # 图片内容（用于视觉模型）
+                    if files:
+                        for f in files:
+                            if f.get('type') and f['type'].startswith('image/'):
+                                # 图片：记录 base64 数据，后续可能用于视觉模型
+                                image_contents.append({
+                                    'name': f['name'],
+                                    'type': f['type'],
+                                    'data': f.get('content', '')  # base64 数据
+                                })
+                                message += f"\n[图片: {f['name']}]"
+                            elif f.get('content'):
+                                # 文本文件：直接添加内容
+                                message += f"\n\n文件 {f['name']} 内容:\n{f['content'][:3000]}"
+                                if len(f['content']) > 3000:
+                                    message += "...(内容过长已截断)"
+                    
+                    # 保存图片信息到 extra_data（用于历史记录）
+                    extra_data_for_msg = None
+                    if image_contents:
+                        # 只保存图片 URL（不保存完整 base64）
+                        extra_data_for_msg = {
+                            'images': [{'name': i['name'], 'type': i['type']} for i in image_contents],
+                            'files': [{'name': f['name'], 'type': f['type']} for f in files if not f['type'].startswith('image/')]
+                        }
+                    
                     # 1. 获取Agent配置
                     agent_config = agent_service.get_agent_config(current_agent_id)
                     agent_tools = agent_config.get('agent', {}).get('tools', [])
@@ -890,13 +923,22 @@ async def websocket_endpoint(websocket: WebSocket, user_id: str):
                                     'duration_ms': duration_ms
                                 })
                     
-                    # 5. 保存用户消息到数据库（包含搜索结果）
+                    # 5. 保存用户消息到数据库
+                    extra_data_to_save = None
+                    if search_results_for_client:
+                        extra_data_to_save = {'search_results': search_results_for_client, 'search_query': message}
+                    if extra_data_for_msg:
+                        if extra_data_to_save:
+                            extra_data_to_save.update(extra_data_for_msg)
+                        else:
+                            extra_data_to_save = extra_data_for_msg
+                    
                     user_msg = conv_service.add_message(
                         conversation_id=conversation.id,
                         role='user',
                         content=message,
                         source='web',
-                        extra_data={'search_results': search_results_for_client, 'search_query': message} if search_results_for_client else None
+                        extra_data=extra_data_to_save
                     )
                     
                     # 6. 获取对话历史（包含刚保存的用户消息）

templates/index.html

@@ -107,10 +107,23 @@
         .input-row { display: flex; gap: 12px; align-items: center; }
         .input-row textarea { flex: 1; padding: 12px 16px; border: 1px solid #ddd; border-radius: 12px; font-size: 16px; resize: none; outline: none; max-height: 200px; min-height: 48px; line-height: 1.5; }
         .input-row textarea:focus { border-color: #10a37f; }
+        .upload-btn { width: 48px; height: 48px; border-radius: 12px; background: #f5f5f5; border: 1px solid #ddd; cursor: pointer; font-size: 20px; display: flex; align-items: center; justify-content: center; transition: all 0.2s; color: #666; }
+        .upload-btn:hover { background: #e8e8e8; border-color: #10a37f; color: #10a37f; }
         .send-btn { width: 48px; height: 48px; border-radius: 12px; background: #10a37f; border: none; color: #fff; cursor: pointer; font-size: 20px; display: flex; align-items: center; justify-content: center; transition: background 0.2s; }
         .send-btn:hover { background: #0d8c6d; }
         .send-btn:disabled { background: #ccc; cursor: not-allowed; }
         
+        /* 文件预览 */
+        .file-preview-area { margin-top: 12px; display: flex; gap: 8px; flex-wrap: wrap; }
+        .file-preview-item { position: relative; border: 1px solid #e0e0e0; border-radius: 8px; padding: 8px; background: #f8f9fa; max-width: 200px; }
+        .file-preview-item.image-preview { padding: 4px; }
+        .file-preview-item img { max-width: 180px; max-height: 120px; border-radius: 6px; }
+        .file-preview-item .file-icon { display: flex; align-items: center; gap: 8px; }
+        .file-preview-item .file-icon i { font-size: 24px; color: #10a37f; }
+        .file-preview-item .file-name { font-size: 12px; color: #666; max-width: 150px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+        .file-preview-item .file-remove { position: absolute; top: 4px; right: 4px; width: 20px; height: 20px; border-radius: 50%; background: #ff4757; color: white; border: none; cursor: pointer; font-size: 12px; display: flex; align-items: center; justify-content: center; }
+        .file-preview-item .file-remove:hover { background: #ff6b7a; }
+        
         /* 快捷语句 - 横向扁平 */
         .quick-phrases-bar { display: flex; align-items: center; gap: 8px; margin-top: 12px; position: relative; }
         .add-phrase-btn { padding: 6px 10px; background: #f0f0f0; border: 1px solid #ddd; border-radius: 6px; cursor: pointer; font-size: 12px; color: #666; white-space: nowrap; flex-shrink: 0; }
@@ -166,9 +179,12 @@
         <div class="input-container">
             <div class="input-area">
                 <div class="input-row">
+                    <input type="file" id="fileInput" multiple accept="image/*,.pdf,.txt,.md,.json,.csv,.doc,.docx" style="display:none" onchange="handleFileUpload(event)">
+                    <button class="upload-btn" onclick="document.getElementById('fileInput').click()" title="上传文件"><i class="ri-attachment-2"></i></button>
                     <textarea id="messageInput" placeholder="输入消息..." rows="1"></textarea>
                     <button class="send-btn" id="sendBtn" onclick="sendMessage()"><i class="ri-send-plane-fill"></i></button>
                 </div>
+                <div class="file-preview-area" id="filePreviewArea"></div>
                 <div class="quick-phrases-bar">
                     <div class="tool-toggle">
                         <input type="checkbox" id="enableSearch" checked>
@@ -280,11 +296,12 @@
                 case 'stream_end': document.getElementById('sendBtn').disabled = false; break;
                 case 'user_message': 
                     lastUserMessage = data.message.content; // 存储最后一条用户消息
-                    // 如果是刚发送的消息，已经显示了，不再重复显示
-                    if (!isRegenerating && data.message.content !== lastSentMessage) {
+                    // 如果是刚发送的消息（包含文件），已经显示了，不再重复显示
+                    if (!isRegenerating && data.message.content !== lastSentMessage && data.message.content !== lastSentMessageWithFiles) {
                         appendMessage('user', data.message.content); 
                     }
-                    lastSentMessage = null;  // 清除标记
+                    lastSentMessage = null;
+                    lastSentMessageWithFiles = null;  // 清除标记
                     // 注意：不要在这里重置 isRegenerating，要等 assistant_message 处理后再重置
                     break;
                 case 'assistant_message': 
@@ -373,12 +390,18 @@
             div.innerHTML = html;
             
             // 如果是用户消息且有搜索结果，在设置innerHTML后追加
-            if (role === 'user' && extraData && extraData.search_results && extraData.search_results.length > 0) {
-                const searchHtml = buildSearchResultsHtml(extraData.search_results, extraData.search_query || content);
-                // 直接追加到 div 的 innerHTML
-                const bodyDiv = div.querySelector('.message-body');
-                if (bodyDiv) {
-                    bodyDiv.insertAdjacentHTML('beforeend', searchHtml);
+            if (role === 'user' && extraData) {
+                console.log('Processing extraData for user message:', extraData);
+                console.log('search_results exists:', extraData.search_results);
+                if (extraData.search_results && extraData.search_results.length > 0) {
+                    console.log('Building search results HTML for', extraData.search_results.length, 'results');
+                    const searchHtml = buildSearchResultsHtml(extraData.search_results, extraData.search_query || content);
+                    const bodyDiv = div.querySelector('.message-body');
+                    console.log('bodyDiv found:', bodyDiv != null);
+                    if (bodyDiv) {
+                        bodyDiv.insertAdjacentHTML('beforeend', searchHtml);
+                        console.log('Search results HTML inserted');
+                    }
                 }
             }
             
@@ -634,6 +657,7 @@
             const container = document.getElementById('messagesContainer');
             container.innerHTML = '';
             messages.forEach(m => {
+                console.log('displayHistory message:', m.role, 'extra_data:', m.extra_data);
                 appendMessage(m.role, m.content, m.thinking_content, null, m.extra_data);
             });
         }
@@ -766,32 +790,178 @@
         function sendMessage() {
             const input = document.getElementById('messageInput');
             const msg = input.value.trim();
-            if (!msg) return;
+            
+            // 如果没有消息且没有文件，不发送
+            if (!msg && pendingFiles.length === 0) return;
+            
             document.getElementById('sendBtn').disabled = true;
             input.value = '';
             input.style.height = 'auto';
             
-            // 立即显示用户消息（不等后端广播）
-            lastSentMessage = msg;  // 记录最后发送的消息，避免重复显示
-            appendMessage('user', msg);
+            // 立即显示用户消息（包含文件）
+            lastSentMessage = msg;
+            appendMessageWithFiles('user', msg, pendingFiles);
+            
+            // 清空文件预览
+            pendingFiles = [];
+            document.getElementById('filePreviewArea').innerHTML = '';
             
             // 获取工具禁用状态
             const enableSearch = document.getElementById('enableSearch').checked;
             const disabledTools = [];
             if (!enableSearch) disabledTools.push('search');
             
+            // 发送消息（包含文件）
             if (ws?.readyState === WebSocket.OPEN) {
                 ws.send(JSON.stringify({ 
                     action: 'chat', 
                     message: msg, 
                     conversation_id: currentConversationId, 
                     agent_id: currentAgentId,
-                    disabled_tools: disabledTools  // 禁用的工具列表
+                    disabled_tools: disabledTools,
+                    files: lastSentFiles || []  // 发送的文件列表
                 }));
             }
+            
+            lastSentFiles = null;  // 清空
         }
         
-        let lastSentMessage = null;  // 记录最后发送的消息
+        let lastSentFiles = null;  // 记录发送的文件
+        let lastSentMessageWithFiles = null;  // 记录包含文件信息的完整消息
+        
+        // 显示带文件的用户消息
+        function appendMessageWithFiles(role, content, files) {
+            const container = document.getElementById('messagesContainer');
+            container.querySelector('.welcome')?.remove();
+            
+            const div = document.createElement('div');
+            div.className = `message ${role}`;
+            
+            const avatar = role === 'user' ? '👤' : '🤖';
+            let html = `<div class="message-avatar">${avatar}</div><div class="message-body">`;
+            
+            // 显示文本内容
+            if (content) {
+                html += `<div class="message-content"><div class="user-message-text">${escapeHtml(content)}</div></div>`;
+            }
+            
+            // 显示文件（图片直接显示，文本文件显示名称）
+            if (files && files.length > 0) {
+                html += '<div class="uploaded-files" style="margin-top:8px">';
+                lastSentFiles = files.map(f => ({
+                    name: f.name,
+                    type: f.type,
+                    content: f.content
+                }));
+                
+                for (const f of files) {
+                    if (f.type.startsWith('image/')) {
+                        // 图片直接显示
+                        html += `<div class="uploaded-image" style="margin-bottom:8px"><img src="${f.content}" style="max-width:300px;border-radius:8px"></div>`;
+                    } else {
+                        // 文本文件显示名称和内容摘要
+                        html += `<div class="uploaded-file" style="padding:8px;background:#f5f5f5;border-radius:6px;margin-bottom:8px">`;
+                        html += `<div style="font-size:13px;color:#10a37f"><i class="ri-file-text-line"></i> ${f.name}</div>`;
+                        if (f.content && f.content.length < 2000) {
+                            html += `<div style="font-size:12px;color:#666;margin-top:4px">${escapeHtml(f.content.substring(0, 300))}${f.content.length > 300 ? '...' : ''}</div>`;
+                        }
+                        html += '</div>';
+                    }
+                }
+                html += '</div>';
+                
+                // 记录完整消息（用于判断是否重复显示）
+                lastSentMessageWithFiles = content + '\n[文件:' + files.map(f => f.name).join(',') + ']';
+            }
+            
+            html += '</div>';
+            div.innerHTML = html;
+            container.appendChild(div);
+            
+            container.scrollTop = container.scrollHeight;
+        }
+            html += `<div class="message-actions"><button class="action-btn" onclick="copyMessage(this)"><i class="ri-file-copy-line"></i> 复制</button></div>`;
+            html += '</div>';
+            div.innerHTML = html;
+            container.appendChild(div);
+            
+            container.scrollTop = container.scrollHeight;
+        }
+        let pendingFiles = [];  // 待发送的文件
+        
+        // 文件上传处理
+        function handleFileUpload(event) {
+            const files = event.target.files;
+            const previewArea = document.getElementById('filePreviewArea');
+            
+            for (const file of files) {
+                const fileId = 'file-' + Date.now() + '-' + Math.random().toString(36).substr(2, 9);
+                
+                // 读取文件内容
+                const reader = new FileReader();
+                reader.onload = (e) => {
+                    const fileData = {
+                        id: fileId,
+                        name: file.name,
+                        type: file.type,
+                        size: file.size,
+                        content: e.target.result
+                    };
+                    pendingFiles.push(fileData);
+                    
+                    // 显示预览
+                    const previewItem = document.createElement('div');
+                    previewItem.className = 'file-preview-item';
+                    previewItem.id = fileId + '-preview';
+                    
+                    if (file.type.startsWith('image/')) {
+                        previewItem.classList.add('image-preview');
+                        previewItem.innerHTML = `
+                            <img src="${e.target.result}" alt="${file.name}">
+                            <button class="file-remove" onclick="removeFile('${fileId}')"><i class="ri-close-line"></i></button>
+                        `;
+                    } else {
+                        // 文件图标
+                        let iconClass = 'ri-file-text-line';
+                        if (file.name.endsWith('.pdf')) iconClass = 'ri-file-pdf-line';
+                        else if (file.name.endsWith('.json')) iconClass = 'ri-code-line';
+                        else if (file.name.endsWith('.csv')) iconClass = 'ri-table-line';
+                        else if (file.type.includes('word') || file.name.endsWith('.doc') || file.name.endsWith('.docx')) iconClass = 'ri-file-word-line';
+                        
+                        previewItem.innerHTML = `
+                            <div class="file-icon">
+                                <i class="${iconClass}"></i>
+                                <span class="file-name">${file.name}</span>
+                            </div>
+                            <button class="file-remove" onclick="removeFile('${fileId}')"><i class="ri-close-line"></i></button>
+                        `;
+                    }
+                    
+                    previewArea.appendChild(previewItem);
+                };
+                
+                // 根据文件类型选择读取方式
+                if (file.type.startsWith('image/')) {
+                    reader.readAsDataURL(file);
+                } else if (file.type === 'application/pdf') {
+                    reader.readAsDataURL(file);
+                } else {
+                    // 文本类文件直接读取内容
+                    reader.readAsText(file);
+                }
+            }
+            
+            // 清空 input 以便再次选择
+            event.target.value = '';
+        }
+        
+        function removeFile(fileId) {
+            pendingFiles = pendingFiles.filter(f => f.id !== fileId);
+            const preview = document.getElementById(fileId + '-preview');
+            if (preview) preview.remove();
+        }
+        
+        // 发送消息
         
         function setupTextarea() {
             const textarea = document.getElementById('messageInput');