fix: 修复数据库缺少tools字段，移动搜索复选框到输入框区域

- 新增 SearchToolConfig 模型：支持搜索工具配置
- Agent 增加 tools 字段：可配置可用工具列表
- 后台管理增加搜索工具配置页面
- Agent 管理增加工具启用开关
- 网页端增加搜索工具禁用复选框
- WebSocket chat 处理增加搜索调用逻辑
- 默认配置 Tavily Search API

main_v2.py

@@ -18,11 +18,11 @@ import os
 from models_v2 import (
     init_db, get_db, SessionLocal, 
     User, Conversation, Message, SystemConfig,
-    LLMProvider, Agent, Channel, ChannelAgentMapping, MatrixRoomMapping,
+    LLMProvider, Agent, Channel, ChannelAgentMapping, MatrixRoomMapping, SearchToolConfig,
     init_default_data
 )
 from services.llm_service import llm_service
-from services.agent_service import AgentService, LLMProviderService, ChannelService
+from services.agent_service import AgentService, LLMProviderService, ChannelService, SearchToolService
 from services.conversation_service import ConversationService
 
 # 配置日志
@@ -204,6 +204,7 @@ async def get_agents(db: Session = Depends(get_db)):
                 "thinking_prompt": a.thinking_prompt,
                 "thinking_prefix": a.thinking_prefix,
                 "thinking_suffix": a.thinking_suffix,
+                "tools": a.tools or [],  # 工具列表
                 "max_history": a.max_history,
                 "temperature_override": a.temperature_override,
                 "is_default": a.is_default,
@@ -418,6 +419,128 @@ async def unbind_agent(mapping_id: int, db: Session = Depends(get_db)):
     return {"success": success}
 
 
+# ==================== 搜索工具 API ====================
+
+@app.get("/api/v2/search-tools")
+async def get_search_tools(db: Session = Depends(get_db)):
+    """获取所有搜索工具配置"""
+    service = SearchToolService(db)
+    configs = service.get_all_configs()
+    
+    return {
+        "configs": [
+            {
+                "id": c.id,
+                "name": c.name,
+                "provider": c.provider,
+                "api_key": c.api_key,
+                "api_base": c.api_base,
+                "max_results": c.max_results,
+                "include_raw_content": c.include_raw_content,
+                "search_depth": c.search_depth,
+                "is_active": c.is_active,
+                "is_default": c.is_default
+            }
+            for c in configs
+        ]
+    }
+
+
+@app.post("/api/v2/search-tools")
+async def create_search_tool(data: dict, db: Session = Depends(get_db)):
+    """创建搜索工具配置"""
+    service = SearchToolService(db)
+    
+    # 如果设为默认，更新其他
+    if data.get('is_default'):
+        service.set_default_config(0)  # 先清除所有默认
+    
+    config = service.create_config(data)
+    return {"success": True, "config": {"id": config.id, "name": config.name}}
+
+
+@app.put("/api/v2/search-tools/{config_id}")
+async def update_search_tool(config_id: int, data: dict, db: Session = Depends(get_db)):
+    """更新搜索工具配置"""
+    service = SearchToolService(db)
+    
+    if data.get('is_default'):
+        service.set_default_config(config_id)
+    
+    config = service.update_config(config_id, data)
+    
+    if not config:
+        return {"success": False, "message": "配置不存在"}
+    
+    return {"success": True, "config": {"id": config.id, "name": config.name}}
+
+
+@app.delete("/api/v2/search-tools/{config_id}")
+async def delete_search_tool(config_id: int, db: Session = Depends(get_db)):
+    """删除搜索工具配置"""
+    service = SearchToolService(db)
+    success = service.delete_config(config_id)
+    
+    return {"success": success}
+
+
+@app.post("/api/v2/search-tools/{config_id}/default")
+async def set_search_tool_default(config_id: int, db: Session = Depends(get_db)):
+    """设置默认搜索工具"""
+    service = SearchToolService(db)
+    success = service.set_default_config(config_id)
+    
+    return {"success": success}
+
+
+@app.post("/api/v2/search")
+async def perform_search(data: dict, db: Session = Depends(get_db)):
+    """执行搜索（供前端或Agent调用）"""
+    import httpx
+    
+    query = data.get('query')
+    if not query:
+        return {"success": False, "message": "缺少搜索关键词"}
+    
+    # 获取搜索工具配置
+    service = SearchToolService(db)
+    config_id = data.get('config_id')
+    
+    if config_id:
+        config = service.get_config(config_id)
+    else:
+        config = service.get_default_config()
+    
+    if not config or not config.api_key:
+        return {"success": False, "message": "未配置搜索工具"}
+    
+    # Tavily Search API
+    if config.provider == 'tavily':
+        try:
+            tavily_url = "https://api.tavily.com/search"
+            payload = {
+                "api_key": config.api_key,
+                "query": query,
+                "max_results": config.max_results,
+                "include_raw_content": config.include_raw_content,
+                "search_depth": config.search_depth
+            }
+            
+            async with httpx.AsyncClient(timeout=30) as client:
+                response = await client.post(tavily_url, json=payload)
+                result = response.json()
+            
+            return {
+                "success": True,
+                "results": result.get("results", []),
+                "query": query
+            }
+        except Exception as e:
+            return {"success": False, "message": str(e)}
+    
+    return {"success": False, "message": "不支持的搜索提供商"}
+
+
 # ==================== 对话 API（保留原有） ====================
 
 @app.get("/api/conversations")
@@ -610,6 +733,7 @@ async def websocket_endpoint(websocket: WebSocket, user_id: str):
                     conversation_id = data.get("conversation_id")
                     enable_thinking = data.get("enable_thinking", True)
                     agent_id_override = data.get("agent_id")
+                    disabled_tools = data.get("disabled_tools", [])  # 禁用的工具列表
                     
                     if agent_id_override:
                         agent = agent_service.get_agent(agent_id_override)
@@ -619,6 +743,48 @@ async def websocket_endpoint(websocket: WebSocket, user_id: str):
                     if not message.strip():
                         continue
                     
+                    # 获取Agent配置
+                    agent_config = agent_service.get_agent_config(current_agent_id)
+                    agent_tools = agent_config.get('agent', {}).get('tools', [])
+                    
+                    # 检查是否需要执行搜索
+                    search_context = None
+                    if 'search' in agent_tools and 'search' not in disabled_tools:
+                        # 使用关键词检测：如果消息包含搜索相关关键词，执行搜索
+                        search_keywords = ['搜索', '查找', '查询', '最新', '新闻', '新闻', 'weather', '天气', '股价', '股票', '汇率', 'what is', 'what are', 'find', 'search', 'look up']
+                        should_search = any(kw in message.lower() for kw in search_keywords)
+                        
+                        if should_search:
+                            # 执行搜索
+                            search_service = SearchToolService(db)
+                            search_config = search_service.get_default_config()
+                            
+                            if search_config and search_config.api_key:
+                                import httpx
+                                try:
+                                    logger.info(f"执行搜索: query={message}")
+                                    tavily_url = "https://api.tavily.com/search"
+                                    payload = {
+                                        "api_key": search_config.api_key,
+                                        "query": message,
+                                        "max_results": search_config.max_results,
+                                        "search_depth": search_config.search_depth
+                                    }
+                                    
+                                    # 同步调用（简化处理）
+                                    with httpx.Client(timeout=30) as client:
+                                        resp = client.post(tavily_url, json=payload)
+                                        search_result = resp.json()
+                                    
+                                    if search_result.get("results"):
+                                        # 构建搜索上下文
+                                        search_context = "\n\n【搜索结果】\n"
+                                        for i, r in enumerate(search_result["results"][:5], 1):
+                                            search_context += f"{i}. {r.get('title', 'N/A')}\n   {r.get('content', r.get('snippet', 'N/A'))[:200]}\n   来源: {r.get('url', 'N/A')}\n"
+                                        logger.info(f"搜索完成: {len(search_result['results'])} 条结果")
+                                except Exception as e:
+                                    logger.error(f"搜索失败: {e}")
+                    
                     # 获取或创建会话
                     if conversation_id:
                         conversation = conv_service.get_conversation(conversation_id)
@@ -664,6 +830,14 @@ async def websocket_endpoint(websocket: WebSocket, user_id: str):
                     # 获取对话历史
                     history = conv_service.get_conversation_history(conversation_id, limit=agent_config['agent'].get('max_history', 20))
                     
+                    # 如果有搜索结果，添加到消息中
+                    if search_context:
+                        # 在系统提示中添加搜索结果说明
+                        modified_system_prompt = agent_config['agent'].get('system_prompt', '') + "\n\n如果提供了搜索结果，请基于搜索结果回答用户问题，并注明信息来源。"
+                        agent_config['agent']['system_prompt'] = modified_system_prompt
+                        # 将搜索结果作为系统消息添加到历史
+                        history.append({"role": "system", "content": f"以下是搜索到的相关信息，请参考这些内容回答用户问题：{search_context}"})
+                    
                     # 使用非流式调用LLM（简化版本，确保稳定）
                     try:
                         # 调用LLM（非流式）

models_v2.py

@@ -58,6 +58,9 @@ class Agent(Base):
     name = Column(String(100), unique=True, index=True)  # Agent名称
     display_name = Column(String(100))  # 显示名称
     
+    # 工具配置
+    tools = Column(JSON, default=list)  # 可用工具列表 ["search", "calculator", ...]
+    
     # 大模型配置
     llm_provider_id = Column(Integer, ForeignKey('llm_providers.id'))
     model_override = Column(String(100), nullable=True)  # 覆盖Provider默认模型
@@ -224,6 +227,33 @@ class MatrixRoomMapping(Base):
     created_at = Column(DateTime, default=datetime.utcnow)
 
 
+# ==================== 搜索工具配置 ====================
+
+class SearchToolConfig(Base):
+    """搜索工具配置（Tavily等）"""
+    __tablename__ = 'search_tool_config'
+    
+    id = Column(Integer, primary_key=True, index=True)
+    name = Column(String(100))  # 工具名称，如 "Tavily Search"
+    provider = Column(String(50))  # 提供商：tavily, google, bing
+    
+    # API配置
+    api_key = Column(String(200))  # API密钥
+    api_base = Column(String(200), nullable=True)  # API地址（可选）
+    
+    # 搜索参数
+    max_results = Column(Integer, default=5)  # 最大返回结果数
+    include_raw_content = Column(Boolean, default=False)  # 是否包含原始内容
+    search_depth = Column(String(20), default='basic')  # basic 或 advanced
+    
+    # 状态
+    is_active = Column(Boolean, default=True)
+    is_default = Column(Boolean, default=False)  # 是否为默认搜索工具
+    
+    created_at = Column(DateTime, default=datetime.utcnow)
+    updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
+
+
 # ==================== 系统配置（保留） ====================
 
 class SystemConfig(Base):
@@ -335,6 +365,18 @@ def init_default_data():
         )
         db.add(matrix_mapping)
         
+        # 5. 创建默认搜索工具配置
+        search_config = SearchToolConfig(
+            name="Tavily Search",
+            provider="tavily",
+            api_key="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",
+            max_results=5,
+            search_depth="basic",
+            is_active=True,
+            is_default=True
+        )
+        db.add(search_config)
+        
         db.commit()
         print("默认数据初始化完成")
         

services/agent_service.py

@@ -5,7 +5,7 @@ from sqlalchemy.orm import Session
 from typing import List, Optional, Dict
 import logging
 
-from models_v2 import Agent, LLMProvider, ChannelAgentMapping, Channel, init_default_data
+from models_v2 import Agent, LLMProvider, ChannelAgentMapping, Channel, SearchToolConfig, init_default_data
 
 logger = logging.getLogger(__name__)
 
@@ -52,6 +52,7 @@ class AgentService:
             thinking_prompt=data.get('thinking_prompt'),
             thinking_prefix=data.get('thinking_prefix', ''),
             thinking_suffix=data.get('thinking_suffix', ''),
+            tools=data.get('tools', []),  # 工具列表
             max_history=data.get('max_history', 20),
             temperature_override=data.get('temperature_override'),
             is_active=data.get('is_active', True),
@@ -405,4 +406,87 @@ class ChannelService:
             'is_active': channel.is_active,
             'is_primary': channel.is_primary,
             'agent_mappings': self.get_channel_agents(channel_id)
-        }
+        }
+
+
+class SearchToolService:
+    """搜索工具管理服务"""
+    
+    def __init__(self, db: Session):
+        self.db = db
+    
+    def get_all_configs(self) -> List[SearchToolConfig]:
+        """获取所有搜索工具配置"""
+        return self.db.query(SearchToolConfig).order_by(SearchToolConfig.is_default.desc(), SearchToolConfig.name).all()
+    
+    def get_active_configs(self) -> List[SearchToolConfig]:
+        """获取活跃的搜索工具配置"""
+        return self.db.query(SearchToolConfig).filter(SearchToolConfig.is_active == True).all()
+    
+    def get_config(self, config_id: int) -> Optional[SearchToolConfig]:
+        """获取单个配置"""
+        return self.db.query(SearchToolConfig).filter(SearchToolConfig.id == config_id).first()
+    
+    def get_default_config(self) -> Optional[SearchToolConfig]:
+        """获取默认配置"""
+        config = self.db.query(SearchToolConfig).filter(
+            SearchToolConfig.is_default == True,
+            SearchToolConfig.is_active == True
+        ).first()
+        if not config:
+            config = self.db.query(SearchToolConfig).filter(SearchToolConfig.is_active == True).first()
+        return config
+    
+    def create_config(self, data: Dict) -> SearchToolConfig:
+        """创建搜索工具配置"""
+        config = SearchToolConfig(
+            name=data.get('name'),
+            provider=data.get('provider', 'tavily'),
+            api_key=data.get('api_key'),
+            api_base=data.get('api_base'),
+            max_results=data.get('max_results', 5),
+            include_raw_content=data.get('include_raw_content', False),
+            search_depth=data.get('search_depth', 'basic'),
+            is_active=data.get('is_active', True),
+            is_default=data.get('is_default', False)
+        )
+        self.db.add(config)
+        self.db.commit()
+        self.db.refresh(config)
+        return config
+    
+    def update_config(self, config_id: int, data: Dict) -> Optional[SearchToolConfig]:
+        """更新配置"""
+        config = self.get_config(config_id)
+        if not config:
+            return None
+        
+        for key, value in data.items():
+            if hasattr(config, key) and value is not None:
+                setattr(config, key, value)
+        
+        self.db.commit()
+        self.db.refresh(config)
+        return config
+    
+    def delete_config(self, config_id: int) -> bool:
+        """删除配置"""
+        config = self.get_config(config_id)
+        if not config:
+            return False
+        
+        self.db.delete(config)
+        self.db.commit()
+        return True
+    
+    def set_default_config(self, config_id: int) -> bool:
+        """设置默认配置"""
+        self.db.query(SearchToolConfig).update({SearchToolConfig.is_default: False})
+        
+        config = self.get_config(config_id)
+        if not config:
+            return False
+        
+        config.is_default = True
+        self.db.commit()
+        return True

templates/admin_v2/index.html

@@ -42,6 +42,7 @@
             <div class="nav-item active" data-page="llm-providers"><i class="ri-cloud-line"></i> 大模型池</div>
             <div class="nav-item" data-page="agents"><i class="ri-robot-2-line"></i> Agent管理</div>
             <div class="nav-item" data-page="channels"><i class="ri-chat-3-line"></i> 渠道管理</div>
+            <div class="nav-item" data-page="search-tools"><i class="ri-search-line"></i> 搜索工具</div>
             <div class="nav-item" data-page="stats"><i class="ri-bar-chart-box-line"></i> 统计数据</div>
         </div>
     </div>
@@ -109,6 +110,23 @@
             </div>
         </div>
 
+        <!-- 搜索工具 -->
+        <div class="page-section" id="page-search-tools">
+            <div class="page-header"><h2><i class="ri-search-line"></i> 搜索工具配置</h2></div>
+            <div class="card">
+                <div class="card-header d-flex justify-content-between">
+                    <span>搜索工具列表（Tavily、Google等）</span>
+                    <button class="btn btn-primary btn-sm" onclick="showAddSearchToolModal()"><i class="ri-add-line"></i> 添加</button>
+                </div>
+                <div class="card-body">
+                    <table class="table">
+                        <thead><tr><th>名称</th><th>提供商</th><th>API Key</th><th>最大结果</th><th>默认</th><th>状态</th><th>操作</th></tr></thead>
+                        <tbody id="search-tools-list"><tr><td colspan="7" class="text-center">加载中...</td></tr></tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+
         <!-- 统计 -->
         <div class="page-section" id="page-stats">
             <div class="page-header"><h2><i class="ri-bar-chart-box-line"></i> 统计数据</h2></div>
@@ -152,6 +170,8 @@
             <div class="row mt-3"><div class="col-md-4 form-check"><input type="checkbox" class="form-check-input" id="agent-active" checked><label class="form-check-label">启用</label></div><div class="col-md-4 form-check"><input type="checkbox" class="form-check-input" id="agent-default"><label class="form-check-label">默认</label></div><div class="col-md-4"><label class="form-label">温度覆盖</label><input type="number" class="form-control" id="agent-temperature-override" step="0.1"></div></div>
             <hr><h6>思考功能</h6>
             <div class="thinking-config"><div class="form-check"><input type="checkbox" class="form-check-input" id="agent-enable-thinking" checked><label class="form-check-label">启用思考</label></div><div class="mt-2"><label class="form-label">思考提示词</label><textarea class="form-control" id="agent-thinking-prompt" rows="2"></textarea></div><div class="row mt-2"><div class="col-md-6"><label class="form-label">前缀</label><input type="text" class="form-control" id="agent-thinking-prefix"></div><div class="col-md-6"><label class="form-label">后缀</label><input type="text" class="form-control" id="agent-thinking-suffix"></div></div></div>
+            <hr><h6>工具配置</h6>
+            <div class="thinking-config"><div class="form-check"><input type="checkbox" class="form-check-input" id="agent-tool-search"><label class="form-check-label">启用搜索工具</label></div><small class="text-muted">启用后 Agent 可以使用搜索功能获取实时信息</small></div>
         </form></div>
         <div class="modal-footer"><button type="button" class="btn btn-secondary" data-bs-dismiss="modal">取消</button><button type="button" class="btn btn-primary" onclick="saveAgent()">保存</button></div>
     </div></div></div>
@@ -180,6 +200,22 @@
         <div class="modal-footer"><button type="button" class="btn btn-secondary" data-bs-dismiss="modal">取消</button><button type="button" class="btn btn-primary" onclick="saveMatrixConfig()">保存</button></div>
     </div></div></div>
 
+    <!-- Search Tool Modal -->
+    <div class="modal fade" id="searchToolModal"><div class="modal-dialog"><div class="modal-content">
+        <div class="modal-header"><h5 class="modal-title">添加/编辑搜索工具</h5><button type="button" class="btn-close" data-bs-dismiss="modal"></button></div>
+        <div class="modal-body"><form id="search-tool-form">
+            <input type="hidden" id="search-tool-id">
+            <div class="mb-3"><label class="form-label">名称</label><input type="text" class="form-control" id="search-tool-name" value="Tavily Search"></div>
+            <div class="mb-3"><label class="form-label">提供商</label><select class="form-select" id="search-tool-provider"><option value="tavily">Tavily</option><option value="google">Google</option><option value="bing">Bing</option></select></div>
+            <div class="mb-3"><label class="form-label">API Key *</label><input type="text" class="form-control" id="search-tool-api-key" required></div>
+            <div class="mb-3"><label class="form-label">API地址（可选）</label><input type="text" class="form-control" id="search-tool-api-base"></div>
+            <div class="row"><div class="col-md-6"><label class="form-label">最大结果数</label><input type="number" class="form-control" id="search-tool-max-results" value="5"></div><div class="col-md-6"><label class="form-label">搜索深度</label><select class="form-select" id="search-tool-depth"><option value="basic">Basic</option><option value="advanced">Advanced</option></select></div></div>
+            <div class="mt-3 form-check"><input type="checkbox" class="form-check-input" id="search-tool-active" checked><label class="form-check-label">启用</label></div>
+            <div class="mt-2 form-check"><input type="checkbox" class="form-check-input" id="search-tool-default"><label class="form-check-label">设为默认</label></div>
+        </form></div>
+        <div class="modal-footer"><button type="button" class="btn btn-secondary" data-bs-dismiss="modal">取消</button><button type="button" class="btn btn-primary" onclick="saveSearchTool()">保存</button></div>
+    </div></div></div>
+
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
     <script>
         // 全局数据
@@ -190,6 +226,7 @@
             if (page === 'llm-providers') loadProviders();
             if (page === 'agents') loadAgents();
             if (page === 'channels') loadChannels();
+            if (page === 'search-tools') loadSearchTools();
             if (page === 'stats') loadStats();
         }
 
@@ -348,11 +385,18 @@
             document.getElementById('agent-thinking-prompt').value = a.thinking_prompt || '';
             document.getElementById('agent-thinking-prefix').value = a.thinking_prefix || '';
             document.getElementById('agent-thinking-suffix').value = a.thinking_suffix || '';
+            // 工具配置
+            const tools = a.tools || [];
+            document.getElementById('agent-tool-search').checked = tools.includes('search');
             new bootstrap.Modal(document.getElementById('agentModal')).show();
         }
 
         async function saveAgent() {
             const id = document.getElementById('agent-id').value;
+            // 处理工具列表
+            const tools = [];
+            if (document.getElementById('agent-tool-search').checked) tools.push('search');
+            
             const data = {
                 name: document.getElementById('agent-name').value,
                 display_name: document.getElementById('agent-display-name').value,
@@ -367,7 +411,8 @@
                 enable_thinking: document.getElementById('agent-enable-thinking').checked,
                 thinking_prompt: document.getElementById('agent-thinking-prompt').value,
                 thinking_prefix: document.getElementById('agent-thinking-prefix').value,
-                thinking_suffix: document.getElementById('agent-thinking-suffix').value
+                thinking_suffix: document.getElementById('agent-thinking-suffix').value,
+                tools: tools  // 工具列表
             };
             const res = await fetch(id ? `/api/v2/agents/${id}` : '/api/v2/agents', { method: id ? 'PUT' : 'POST', headers:{'Content-Type':'application/json'}, body: JSON.stringify(data) });
             const result = await res.json();
@@ -482,6 +527,102 @@
             document.getElementById('stat-agents').textContent = (agentsData.agents || []).length;
         }
 
+        // ===== 搜索工具 =====
+        async function loadSearchTools() {
+            const res = await fetch('/api/v2/search-tools');
+            const data = await res.json();
+            const tools = data.configs || [];
+            const tbody = document.getElementById('search-tools-list');
+            if (tools.length === 0) {
+                tbody.innerHTML = '<tr><td colspan="7" class="text-center text-muted">暂无配置，点击添加按钮创建</td></tr>';
+                return;
+            }
+            tbody.innerHTML = tools.map(t => `
+                <tr>
+                    <td>${t.name}</td>
+                    <td>${t.provider}</td>
+                    <td><small class="text-muted">${t.api_key ? t.api_key.substring(0, 10) + '...' : '-'}</small></td>
+                    <td>${t.max_results}</td>
+                    <td>${t.is_default ? '<i class="ri-check-line text-success"></i>' : ''}</td>
+                    <td>${t.is_active ? '<span class="badge bg-success">启用</span>' : '<span class="badge bg-secondary">禁用</span>'}</td>
+                    <td>
+                        <button class="btn btn-sm btn-outline-primary" onclick="editSearchTool(${t.id})"><i class="ri-edit-line"></i></button>
+                        <button class="btn btn-sm btn-outline-danger" onclick="deleteSearchTool(${t.id})"><i class="ri-delete-bin-line"></i></button>
+                    </td>
+                </tr>
+            `).join('');
+        }
+
+        function showAddSearchToolModal() {
+            document.getElementById('search-tool-id').value = '';
+            document.getElementById('search-tool-name').value = 'Tavily Search';
+            document.getElementById('search-tool-provider').value = 'tavily';
+            document.getElementById('search-tool-api-key').value = '';
+            document.getElementById('search-tool-api-base').value = '';
+            document.getElementById('search-tool-max-results').value = 5;
+            document.getElementById('search-tool-depth').value = 'basic';
+            document.getElementById('search-tool-active').checked = true;
+            document.getElementById('search-tool-default').checked = false;
+            new bootstrap.Modal(document.getElementById('searchToolModal')).show();
+        }
+
+        async function editSearchTool(id) {
+            const res = await fetch('/api/v2/search-tools');
+            const data = await res.json();
+            const tool = (data.configs || []).find(t => t.id === id);
+            if (!tool) return;
+            document.getElementById('search-tool-id').value = tool.id;
+            document.getElementById('search-tool-name').value = tool.name;
+            document.getElementById('search-tool-provider').value = tool.provider;
+            document.getElementById('search-tool-api-key').value = tool.api_key || '';
+            document.getElementById('search-tool-api-base').value = tool.api_base || '';
+            document.getElementById('search-tool-max-results').value = tool.max_results;
+            document.getElementById('search-tool-depth').value = tool.search_depth;
+            document.getElementById('search-tool-active').checked = tool.is_active;
+            document.getElementById('search-tool-default').checked = tool.is_default;
+            new bootstrap.Modal(document.getElementById('searchToolModal')).show();
+        }
+
+        async function saveSearchTool() {
+            const id = document.getElementById('search-tool-id').value;
+            const data = {
+                name: document.getElementById('search-tool-name').value,
+                provider: document.getElementById('search-tool-provider').value,
+                api_key: document.getElementById('search-tool-api-key').value,
+                api_base: document.getElementById('search-tool-api-base').value,
+                max_results: parseInt(document.getElementById('search-tool-max-results').value),
+                search_depth: document.getElementById('search-tool-depth').value,
+                is_active: document.getElementById('search-tool-active').checked,
+                is_default: document.getElementById('search-tool-default').checked
+            };
+            let res;
+            if (id) {
+                res = await fetch(`/api/v2/search-tools/${id}`, { method: 'PUT', headers: {'Content-Type': 'application/json'}, body: JSON.stringify(data) });
+            } else {
+                res = await fetch('/api/v2/search-tools', { method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify(data) });
+            }
+            const result = await res.json();
+            if (result.success) {
+                bootstrap.Modal.getInstance(document.getElementById('searchToolModal')).hide();
+                loadSearchTools();
+                alert('保存成功');
+            } else {
+                alert('保存失败: ' + result.message);
+            }
+        }
+
+        async function deleteSearchTool(id) {
+            if (!confirm('确定删除此搜索工具配置？')) return;
+            const res = await fetch(`/api/v2/search-tools/${id}`, { method: 'DELETE' });
+            const result = await res.json();
+            if (result.success) {
+                loadSearchTools();
+                alert('删除成功');
+            } else {
+                alert('删除失败');
+            }
+        }
+
         // ===== 初始化 =====
         document.addEventListener('DOMContentLoaded', function() {
             // 页面切换事件绑定

templates/index.html

@@ -32,6 +32,9 @@
         .agent-selector select { padding: 8px 12px; border: 1px solid #ddd; border-radius: 8px; font-size: 14px; cursor: pointer; min-width: 150px; }
         .ws-status { font-size: 12px; color: #666; background: #f0f0f0; padding: 4px 8px; border-radius: 4px; }
         .ws-status.connected { color: #10a37f; }
+        .tool-toggle { display: flex; align-items: center; gap: 6px; font-size: 12px; }
+        .tool-toggle input { width: 14px; height: 14px; }
+        .tool-toggle label { cursor: pointer; }
         
         .messages-container { flex: 1; overflow-y: auto; padding: 24px; }
         .message { max-width: 800px; margin: 0 auto 24px; display: flex; gap: 16px; }
@@ -52,14 +55,30 @@
         .user-message-text { background: #f0f0f0; padding: 12px 16px; border-radius: 12px; font-size: 15px; }
         
         /* 消息操作按钮 */
-        .message-actions { display: flex; gap: 8px; margin-top: 8px; opacity: 0; transition: opacity 0.2s; }
-        .message-content:hover + .message-actions,
-        .message-actions:hover { opacity: 1; }
+        .message-actions { display: flex; gap: 8px; margin-top: 8px; align-items: center; flex-wrap: wrap; }
         .action-btn { padding: 6px 12px; background: #f5f5f5; border: 1px solid #e0e0e0; border-radius: 6px; cursor: pointer; font-size: 12px; color: #666; display: flex; align-items: center; gap: 4px; transition: all 0.2s; }
         .action-btn:hover { background: #e8e8e8; border-color: #ccc; }
         .action-btn.copied { color: #10a37f; border-color: #10a37f; background: #e8f5e9; }
         .action-btn.regenerate:hover { color: #667eea; border-color: #667eea; }
         
+        /* 版本切换控件 - 简洁版 */
+        .version-switcher { display: none; align-items: center; gap: 4px; margin-left: 4px; }
+        .version-switcher.show { display: flex; }
+        .version-arrow { width: 24px; height: 24px; border-radius: 4px; background: #f5f5f5; border: 1px solid #e0e0e0; cursor: pointer; display: flex; align-items: center; justify-content: center; color: #666; font-size: 14px; transition: all 0.2s; }
+        .version-arrow:hover { background: #e8e8e8; border-color: #667eea; color: #667eea; }
+        .version-arrow:disabled { opacity: 0.4; cursor: not-allowed; background: #f5f5f5; }
+        .version-label { font-size: 11px; color: #888; padding: 0 2px; }
+        
+        /* 加载动画 */
+        .loading-indicator { display: flex; align-items: center; justify-content: center; gap: 8px; padding: 16px; color: #667eea; }
+        .loading-spinner { width: 20px; height: 20px; border: 2px solid #667eea; border-top-color: transparent; border-radius: 50%; animation: spin 1s linear infinite; }
+        @keyframes spin { to { transform: rotate(360deg); } }
+        
+        /* 消息内容容器 */
+        .response-container { position: relative; }
+        .response-version { display: none; }
+        .response-version.active { display: block; }
+        
         /* 思考内容样式 */
         .thinking-block { background: #f8f9fa; border-left: 3px solid #667eea; padding: 12px 16px; margin: 8px 0 16px 0; font-size: 14px; color: #666; border-radius: 4px; position: relative; }
         .thinking-header { display: flex; align-items: center; justify-content: space-between; cursor: pointer; }
@@ -140,6 +159,10 @@
                     <button class="send-btn" id="sendBtn" onclick="sendMessage()"><i class="ri-send-plane-fill"></i></button>
                 </div>
                 <div class="quick-phrases-bar">
+                    <div class="tool-toggle">
+                        <input type="checkbox" id="enableSearch" checked>
+                        <label for="enableSearch"><i class="ri-search-line"></i> 搜索</label>
+                    </div>
                     <button class="add-phrase-btn" onclick="showAddPhraseModal()"><i class="ri-add-line"></i> 添加</button>
                     <div class="phrase-list-wrapper" id="phraseListWrapper" onwheel="scrollPhrases(event)">
                         <div class="phrase-list" id="quickPhrasesList"></div>
@@ -173,6 +196,10 @@
         let agents = [];
         let quickPhrases = [];
         let lastUserMessage = null; // 存储最后一条用户消息，用于重新生成
+        let isRegenerating = false; // 标志：正在重新生成，跳过用户消息显示
+        let regeneratingMessageId = null; // 正在重新生成的消息ID
+        let messageVersionCounter = 0; // 消息版本计数器
+        let messageVersions = {}; // 存储每个assistant消息的多个版本 { messageId: [{content, thinking}] }
         
         document.addEventListener('DOMContentLoaded', () => {
             loadAgents();
@@ -242,9 +269,22 @@
                 case 'stream_end': document.getElementById('sendBtn').disabled = false; break;
                 case 'user_message': 
                     lastUserMessage = data.message.content; // 存储最后一条用户消息
-                    appendMessage('user', data.message.content); 
+                    if (!isRegenerating) {
+                        appendMessage('user', data.message.content); 
+                    }
+                    // 注意：不要在这里重置 isRegenerating，要等 assistant_message 处理后再重置
+                    break;
+                case 'assistant_message': 
+                    if (isRegenerating && regeneratingMessageId) {
+                        // 添加新版本到现有消息
+                        addResponseVersion(regeneratingMessageId, data.message.content, data.message.thinking_content);
+                        regeneratingMessageId = null;
+                        isRegenerating = false; // 在这里重置标志
+                    } else {
+                        appendMessage('assistant', data.message.content, data.message.thinking_content, data.message.agent_name);
+                    }
+                    document.getElementById('sendBtn').disabled = false;
                     break;
-                case 'assistant_message': appendMessage('assistant', data.message.content, data.message.thinking_content, data.message.agent_name); document.getElementById('sendBtn').disabled = false; break;
                 case 'error': showError(data.message); document.getElementById('sendBtn').disabled = false; break;
             }
         }
@@ -258,6 +298,17 @@
             div.className = `message ${role}`;
             
             const avatar = role === 'user' ? '👤' : '🤖';
+            let messageId = null;
+            
+            if (role === 'assistant') {
+                // 为assistant消息生成唯一ID
+                messageId = `msg_${++messageVersionCounter}`;
+                div.id = messageId;
+                div.dataset.messageId = messageId;
+                // 初始化版本存储
+                messageVersions[messageId] = [{ content, thinking }];
+            }
+            
             let html = `<div class="message-avatar">${avatar}</div><div class="message-body">`;
             
             // 思考内容
@@ -271,10 +322,14 @@
                 </div>`;
             }
             
-            // 消息内容
+            // 消息内容 - assistant使用版本容器
             html += `<div class="message-content">`;
             if (role === 'assistant') {
-                html += `<div class="markdown-body">${marked.parse(content)}</div>`;
+                html += `<div class="response-container" id="${messageId}_container">
+                    <div class="response-version active" data-version="0">
+                        <div class="markdown-body">${marked.parse(content)}</div>
+                    </div>
+                </div>`;
             } else {
                 html += `<div class="user-message-text">${escapeHtml(content)}</div>`;
             }
@@ -285,7 +340,13 @@
             html += `<div class="message-actions">`;
             html += `<button class="action-btn" onclick="copyMessage(this)"><i class="ri-file-copy-line"></i> 复制</button>`;
             if (role === 'assistant') {
-                html += `<button class="action-btn regenerate" onclick="regenerateMessage()"><i class="ri-refresh-line"></i> 重新生成</button>`;
+                html += `<button class="action-btn regenerate" onclick="regenerateMessage('${messageId}')"><i class="ri-refresh-line"></i> 重新生成</button>`;
+                // 版本切换控件 - 放在重新生成按钮后面
+                html += `<span class="version-switcher" id="${messageId}_version_switcher">`;
+                html += `<button class="version-arrow" onclick="switchVersion('${messageId}', -1)" data-dir="prev"><i class="ri-arrow-left-s-line"></i></button>`;
+                html += `<span class="version-label" id="${messageId}_version_label">1/1</span>`;
+                html += `<button class="version-arrow" onclick="switchVersion('${messageId}', 1)" data-dir="next"><i class="ri-arrow-right-s-line"></i></button>`;
+                html += `</span>`;
             }
             html += `</div>`;
             
@@ -300,6 +361,167 @@
             container.scrollTop = container.scrollHeight;
         }
         
+        // 添加新版本到现有消息
+        function addResponseVersion(messageId, content, thinking) {
+            const versions = messageVersions[messageId];
+            if (!versions) return;
+            
+            // 添加新版本
+            versions.push({ content, thinking });
+            const newVersionIndex = versions.length - 1;
+            
+            // 更新容器
+            const container = document.getElementById(`${messageId}_container`);
+            if (container) {
+                // 先移除loading（如果有）
+                hideLoadingIndicator(messageId);
+                
+                // 添加思考块（如果有）
+                const messageBody = container.closest('.message-body');
+                if (thinking && messageBody) {
+                    // 先移除旧的思考块
+                    const oldThinking = messageBody.querySelector('.thinking-block');
+                    if (oldThinking) oldThinking.remove();
+                    
+                    // 添加新的思考块
+                    const thinkingHtml = `<div class="thinking-block">
+                        <div class="thinking-header" onclick="toggleThinking(this)">
+                            <span><i class="ri-lightbulb-line"></i> 思考过程</span>
+                            <span class="thinking-toggle">点击展开</span>
+                        </div>
+                        <div class="thinking-content">${escapeHtml(thinking)}</div>
+                    </div>`;
+                    messageBody.insertAdjacentHTML('afterbegin', thinkingHtml);
+                }
+                
+                // 隐藏所有旧版本，显示最新版本
+                container.querySelectorAll('.response-version').forEach(v => v.classList.remove('active'));
+                const newVersionHtml = `<div class="response-version active" data-version="${newVersionIndex}">
+                    <div class="markdown-body">${marked.parse(content)}</div>
+                </div>`;
+                container.insertAdjacentHTML('beforeend', newVersionHtml);
+            }
+            
+            // 更新复制源
+            const messageDiv = document.getElementById(messageId);
+            if (messageDiv) {
+                const copySource = messageDiv.querySelector('.copy-source');
+                if (copySource) copySource.value = content;
+            }
+            
+            // 显示版本切换控件并更新指示器
+            showVersionControls(messageId);
+        }
+        
+        // 显示loading动画
+        function showLoadingIndicator(messageId) {
+            const container = document.getElementById(`${messageId}_container`);
+            if (container) {
+                // 隐藏所有版本
+                container.querySelectorAll('.response-version').forEach(v => v.classList.remove('active'));
+                // 显示loading
+                const loadingHtml = `<div class="loading-indicator" id="${messageId}_loading">
+                    <div class="loading-spinner"></div>
+                    <span>正在生成...</span>
+                </div>`;
+                container.insertAdjacentHTML('beforeend', loadingHtml);
+            }
+        }
+        
+        // 隐藏loading动画
+        function hideLoadingIndicator(messageId) {
+            const loading = document.getElementById(`${messageId}_loading`);
+            if (loading) loading.remove();
+        }
+        
+        // 显示版本切换控件
+        function showVersionControls(messageId) {
+            const switcher = document.getElementById(`${messageId}_version_switcher`);
+            const versions = messageVersions[messageId];
+            if (switcher && versions && versions.length > 1) {
+                switcher.classList.add('show');
+                // 新生成的版本是最后一个，切换到最新版本
+                const container = document.getElementById(`${messageId}_container`);
+                if (container) {
+                    // 隐藏所有版本，显示最后一个
+                    container.querySelectorAll('.response-version').forEach(v => v.classList.remove('active'));
+                    const lastVersion = container.querySelector(`.response-version[data-version="${versions.length - 1}"]`);
+                    if (lastVersion) lastVersion.classList.add('active');
+                }
+                updateVersionIndicator(messageId);
+            }
+        }
+        
+        // 更新版本指示器
+        function updateVersionIndicator(messageId) {
+            const container = document.getElementById(`${messageId}_container`);
+            const label = document.getElementById(`${messageId}_version_label`);
+            const versions = messageVersions[messageId];
+            if (!container || !label || !versions) return;
+            
+            // 找到当前激活的版本
+            const activeVersion = container.querySelector('.response-version.active');
+            const currentIndex = activeVersion ? parseInt(activeVersion.dataset.version) : 0;
+            
+            label.textContent = `${currentIndex + 1}/${versions.length}`;
+            
+            // 更新按钮状态
+            const switcher = document.getElementById(`${messageId}_version_switcher`);
+            if (switcher) {
+                const prevBtn = switcher.querySelector('[data-dir="prev"]');
+                const nextBtn = switcher.querySelector('[data-dir="next"]');
+                if (prevBtn) prevBtn.disabled = currentIndex === 0;
+                if (nextBtn) nextBtn.disabled = currentIndex === versions.length - 1;
+            }
+        }
+        
+        // 切换版本
+        function switchVersion(messageId, direction) {
+            const container = document.getElementById(`${messageId}_container`);
+            const versions = messageVersions[messageId];
+            if (!container || !versions) return;
+            
+            // 找到当前激活的版本
+            const activeVersion = container.querySelector('.response-version.active');
+            const currentIndex = activeVersion ? parseInt(activeVersion.dataset.version) : 0;
+            const newIndex = currentIndex + direction;
+            
+            if (newIndex < 0 || newIndex >= versions.length) return;
+            
+            // 切换显示
+            container.querySelectorAll('.response-version').forEach(v => {
+                v.classList.remove('active');
+                if (parseInt(v.dataset.version) === newIndex) v.classList.add('active');
+            });
+            
+            // 更新复制源
+            const messageDiv = document.getElementById(messageId);
+            if (messageDiv) {
+                const copySource = messageDiv.querySelector('.copy-source');
+                if (copySource) copySource.value = versions[newIndex].content;
+            }
+            
+            // 更新思考块
+            const messageBody = container.closest('.message-body');
+            if (messageBody && versions[newIndex].thinking) {
+                // 移除旧的思考块
+                const oldThinking = messageBody.querySelector('.thinking-block');
+                if (oldThinking) oldThinking.remove();
+                
+                // 添加新版本的思考块
+                const thinkingHtml = `<div class="thinking-block">
+                    <div class="thinking-header" onclick="toggleThinking(this)">
+                        <span><i class="ri-lightbulb-line"></i> 思考过程</span>
+                        <span class="thinking-toggle">点击展开</span>
+                    </div>
+                    <div class="thinking-content">${escapeHtml(versions[newIndex].thinking)}</div>
+                </div>`;
+                messageBody.insertAdjacentHTML('afterbegin', thinkingHtml);
+            }
+            
+            updateVersionIndicator(messageId);
+        }
+        
         function toggleThinking(header) {
             const block = header.parentElement;
             const content = block.querySelector('.thinking-content');
@@ -315,37 +537,58 @@
         
         function copyMessage(btn) {
             // 从隐藏input获取原始内容
-            const hiddenInput = btn.closest('.message-body').querySelector('.copy-source');
+            const actionsDiv = btn.parentElement;
+            const messageBody = actionsDiv.parentElement;
+            const hiddenInput = messageBody.querySelector('.copy-source');
             if (!hiddenInput) {
                 console.error('找不到复制源');
+                btn.innerHTML = '<i class="ri-error-line"></i> 失败';
                 return;
             }
             const text = hiddenInput.value;
             
-            navigator.clipboard.writeText(text).then(() => {
-                btn.innerHTML = '<i class="ri-check-line"></i> 已复制';
-                btn.classList.add('copied');
-                setTimeout(() => { 
-                    btn.innerHTML = '<i class="ri-file-copy-line"></i> 复制'; 
-                    btn.classList.remove('copied'); 
-                }, 2000);
-            }).catch(err => {
+            // 使用传统复制方法（兼容性更好）
+            const textarea = document.createElement('textarea');
+            textarea.value = text;
+            textarea.style.position = 'fixed';
+            textarea.style.left = '-9999px';
+            textarea.style.top = '0';
+            document.body.appendChild(textarea);
+            textarea.focus();
+            textarea.select();
+            
+            try {
+                const success = document.execCommand('copy');
+                if (success) {
+                    btn.innerHTML = '<i class="ri-check-line"></i> 已复制';
+                    btn.classList.add('copied');
+                    setTimeout(() => { 
+                        btn.innerHTML = '<i class="ri-file-copy-line"></i> 复制'; 
+                        btn.classList.remove('copied'); 
+                    }, 2000);
+                } else {
+                    btn.innerHTML = '<i class="ri-error-line"></i> 失败';
+                }
+            } catch (err) {
                 console.error('复制失败:', err);
                 btn.innerHTML = '<i class="ri-error-line"></i> 失败';
-            });
+            }
+            
+            document.body.removeChild(textarea);
         }
         
-        function regenerateMessage() {
+        function regenerateMessage(messageId) {
             if (!lastUserMessage) {
                 alert('没有可重新生成的消息');
                 return;
             }
-            // 移除最后一条助手消息
-            const container = document.getElementById('messagesContainer');
-            const messages = container.querySelectorAll('.message.assistant');
-            if (messages.length > 0) {
-                messages[messages.length - 1].remove();
-            }
+            // 设置重新生成标志，避免再次显示用户消息
+            isRegenerating = true;
+            regeneratingMessageId = messageId;
+            
+            // 显示loading动画
+            showLoadingIndicator(messageId);
+            
             // 重新发送最后一条用户消息
             document.getElementById('sendBtn').disabled = true;
             if (ws?.readyState === WebSocket.OPEN) {
@@ -408,6 +651,15 @@
         }
         
         async function createNewConversation() {
+            // 检查是否已经是新建对话状态（无对话ID且无消息）
+            const container = document.getElementById('messagesContainer');
+            const hasMessages = container.querySelectorAll('.message').length > 0;
+            
+            // 如果当前没有对话ID且没有消息，则不创建新对话
+            if (!currentConversationId && !hasMessages) {
+                return; // 已经是新建对话状态，无需创建
+            }
+            
             const res = await fetch('/api/conversations', { method: 'POST' });
             const data = await res.json();
             currentConversationId = data.id;
@@ -431,8 +683,20 @@
             document.getElementById('sendBtn').disabled = true;
             input.value = '';
             input.style.height = 'auto';
+            
+            // 获取工具禁用状态
+            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 }));
+                ws.send(JSON.stringify({ 
+                    action: 'chat', 
+                    message: msg, 
+                    conversation_id: currentConversationId, 
+                    agent_id: currentAgentId,
+                    disabled_tools: disabledTools  // 禁用的工具列表
+                }));
             }
         }