diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/agent/GetNameInfo.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/agent/GetNameInfo.java
deleted file mode 100644
index 92b7e3c4..00000000
--- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/agent/GetNameInfo.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.ruoyi.agent;
-
-import dev.langchain4j.agentic.Agent;
-import dev.langchain4j.service.SystemMessage;
-import dev.langchain4j.service.UserMessage;
-import dev.langchain4j.service.V;
-
-/**
- * User Name Retrieval Agent
- * A simple assistant that retrieves user names using the get_name tool.
- */
-public interface GetNameInfo {
-
- @SystemMessage("""
- You are a user identity assistant. You MUST always use tools to get information.
-
- MANDATORY REQUIREMENTS:
- - You MUST call the get_user_name_by_id tool for ANY question about names or identity
- - NEVER respond without calling the get_user_name_by_id tool first
- - Return ONLY the exact string returned by the get_user_name_by_id tool
- - Do not make up names like "John Doe" or any other default names
- - Do not use your knowledge to answer - ALWAYS use the tool
-
- Your workflow:
- 1. Extract userId from the query (if mentioned), or use "1" as default
- 2. ALWAYS call the get_user_name_by_id tool with the userId parameter
- 3. Return the exact result as plain text with no additions
-
- CRITICAL: If you don't call the get_user_name_by_id tool, your response is wrong.
- """)
- @UserMessage("""
- Get the user name using the get_user_name_by_id tool. Query: {{query}}
-
- IMPORTANT: Return only the exact result from the tool.
- """)
- @Agent("User identity assistant that returns user name from get_name tool")
- String search(@V("query") String query);
-}
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/agent/McpAgent.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/agent/McpAgent.java
deleted file mode 100644
index 7bef6b4a..00000000
--- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/agent/McpAgent.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.ruoyi.agent;
-
-import dev.langchain4j.agentic.Agent;
-import dev.langchain4j.service.SystemMessage;
-import dev.langchain4j.service.UserMessage;
-import dev.langchain4j.service.V;
-
-public interface McpAgent extends Agent {
-
- /**
- * 系统提示词:通用工具调用智能体
- * 不限定具体工具类型,让 LangChain4j 自动传递工具描述给 LLM
- */
- @SystemMessage("""
- 你是一个AI助手,可以通过调用各种工具来帮助用户完成不同的任务。
-
- 【工具使用规则】
- 1. 根据用户的请求,判断需要使用哪些工具
- 2. 仔细阅读每个工具的描述,确保理解工具的功能和参数要求
- 3. 使用正确的参数调用工具
- 4. 如果工具执行失败,向用户友好地说明错误原因,并尝试提供替代方案
- 5. 对于复杂任务,可以分步骤使用多个工具完成
- 6. 将工具执行结果以清晰易懂的方式呈现给用户
-
- 【响应格式】
- - 直接回答用户的问题
- - 如果使用了工具,说明使用了什么工具以及结果
- - 如果遇到错误,提供友好的错误信息和解决建议
- """)
-
- @UserMessage("""
- {{query}}
- """)
-
- @Agent("通用工具调用智能体")
- /**
- * 智能体对外调用入口
- * @param query 用户的自然语言请求
- * @return 处理结果
- */
- String callMcpTool(@V("query") String query);
-}
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/service/chat/handler/AgentChatHandler.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/service/chat/handler/AgentChatHandler.java
deleted file mode 100644
index ad0b06ca..00000000
--- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/service/chat/handler/AgentChatHandler.java
+++ /dev/null
@@ -1,132 +0,0 @@
-//package org.ruoyi.service.chat.handler;
-//
-//import dev.langchain4j.agentic.AgenticServices;
-//import dev.langchain4j.community.model.dashscope.QwenChatModel;
-//import dev.langchain4j.service.tool.ToolProvider;
-//import lombok.RequiredArgsConstructor;
-//import lombok.extern.slf4j.Slf4j;
-//import org.ruoyi.agent.McpAgent;
-//import org.ruoyi.common.chat.domain.vo.chat.ChatModelVo;
-//import org.ruoyi.common.chat.entity.chat.ChatContext;
-//import org.ruoyi.common.chat.service.chatMessage.IChatMessageService;
-//import org.ruoyi.common.sse.utils.SseMessageUtils;
-//import org.ruoyi.mcp.service.core.ToolProviderFactory;
-//import org.springframework.core.annotation.Order;
-//import org.springframework.stereotype.Component;
-//import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * Agent 深度思考处理器
-// *
-// * 处理 enableThinking=true 的场景,使用 Agent 进行深度思考和工具调用
-// *
-// * @author ageerle@163.com
-// * @date 2025/12/13
-// */
-//@Slf4j
-//@Component
-//@Order(3)
-//@RequiredArgsConstructor
-//public class AgentChatHandler implements ChatHandler {
-//
-// private final ToolProviderFactory toolProviderFactory;
-//
-// @Override
-// public boolean supports(ChatContext context) {
-// Boolean enableThinking = context.getChatRequest().getEnableThinking();
-// return enableThinking != null && enableThinking;
-// }
-//
-// @Override
-// public SseEmitter handle(ChatContext context) {
-// log.info("处理 Agent 深度思考,用户: {}", context.getUserId());
-//
-// Long userId = context.getUserId();
-// String tokenValue = context.getTokenValue();
-// ChatModelVo chatModelVo = context.getChatModelVo();
-//
-// try {
-// // 1. 保存用户消息
-// String content = extractUserContent(context);
-//// saveChatMessage(context.getChatRequest(), userId, content,
-//// RoleType.USER.getName(), chatModelVo);
-//
-// // 2. 执行 Agent 任务
-// String result = doAgent(content, chatModelVo);
-//
-// // 3. 发送结果并保存
-// SseMessageUtils.sendMessage(userId, result);
-// SseMessageUtils.completeConnection(userId, tokenValue);
-//
-//// saveChatMessage(context.getChatRequest(), userId, result,
-//// RoleType.ASSISTANT.getName(), chatModelVo);
-// // todo 保存消息
-// } catch (Exception e) {
-// log.error("Agent 执行失败: {}", e.getMessage(), e);
-// SseMessageUtils.sendMessage(userId, "Agent 执行失败:" + e.getMessage());
-// SseMessageUtils.completeConnection(userId, tokenValue);
-// }
-//
-// return context.getEmitter();
-// }
-//
-// /**
-// * 执行 Agent 任务
-// */
-// private String doAgent(String userMessage, ChatModelVo chatModelVo) {
-// log.info("执行 Agent 任务,消息: {}", userMessage);
-//
-// try {
-// // 1. 加载 LLM 模型
-// QwenChatModel qwenChatModel = QwenChatModel.builder()
-// .apiKey(chatModelVo.getApiKey())
-// .modelName(chatModelVo.getModelName())
-// .build();
-//
-// // 2. 获取内置工具
-// List