From 6590ac762dac883867d00342dce24e379adf9ed1 Mon Sep 17 00:00:00 2001
From: wanghanlin <1533525126@qq.com>
Date: Fri, 14 Aug 2026 15:48:30 +0800
Subject: [PATCH] =?UTF-8?q?feat(role):=20=E5=AE=A2=E6=9C=8D=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=20MCP=20=E5=B7=A5=E5=85=B7=E6=8E=88=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修正 allowedMcpTools 空列表语义：仅无角色(null)回退为全部，空列表=严格禁止
- 三个对话入口区分「无角色」与「角色无授权」，无角色向后兼容允许全部
- 工具注册名引入 configId 命名空间(mcp_<configId>_<name>)，避免跨 Server 同名工具冲突
- 新增 GET /mcp-server/tools 接口，返回按 Server 分组的可用工具清单
- 更新角色 MCP 授权后清理 AssistantApp ChatClient 缓存，改动即时生效
- listRoles 解析 allowed_mcp_tools JSONB 为 string[]，避免 PGobject 原样返回
- 前端 RoleManager 新增「MCP 工具授权」区块，接入保存/脏检测/全部授权
---
 frontend/src/api/mcp-server.ts                |   1 +
 frontend/src/api/role.ts                      |   3 +
 frontend/src/types/models.ts                  |   2 +
 frontend/src/views/RoleManager.vue            | 109 +++++++++++++++++-
 .../com/wok/supportbot/app/AssistantApp.java  |   4 +-
 .../com/wok/supportbot/app/ChatContext.java   |   2 +-
 .../supportbot/controller/AiController.java   |   4 +-
 .../CustomerServiceRoleController.java        |   5 +
 .../controller/McpServerConfigController.java |  49 ++++++++
 .../controller/OpenApiController.java         |   3 +-
 .../mcp/McpToolCallbackAdapter.java           |  24 +++-
 .../service/CustomerServiceRoleService.java   |   3 +
 12 files changed, 200 insertions(+), 9 deletions(-)

diff --git a/frontend/src/api/mcp-server.ts b/frontend/src/api/mcp-server.ts
index 14f9f14..b098b67 100644
--- a/frontend/src/api/mcp-server.ts
+++ b/frontend/src/api/mcp-server.ts
@@ -9,3 +9,4 @@ export function deleteMcpServer(id: string): Promise<ApiResponse> { return reque
 export function toggleMcpServer(id: string, active: boolean): Promise<ApiResponse> { return request.put(`/mcp-server/${id}/toggle?active=${active}`).then(r => r.data) }
 export function testMcpServer(id: string): Promise<ApiResponse> { return request.post(`/mcp-server/${id}/test`, {}).then(r => r.data) }
 export function refreshMcpServers(): Promise<ApiResponse> { return request.post('/mcp-server/refresh', {}).then(r => r.data) }
+export function listAvailableMcpTools(): Promise<ApiResponse> { return request.get('/mcp-server/tools').then(r => r.data) }
diff --git a/frontend/src/api/role.ts b/frontend/src/api/role.ts
index 5351cdb..d37b9e2 100644
--- a/frontend/src/api/role.ts
+++ b/frontend/src/api/role.ts
@@ -9,3 +9,6 @@ export function deleteRole(roleId: string): Promise<ApiResponse> { return reques
 export function updateRoleCategories(roleId: string, categoryIds: string[]): Promise<ApiResponse> {
   return request.put(`/role/${roleId}/categories`, { categoryIds }).then(r => r.data)
 }
+export function updateRoleMcpTools(roleId: string, allowedMcpTools: string[]): Promise<ApiResponse> {
+  return request.put(`/role/${roleId}/mcp-tools`, { allowedMcpTools }).then(r => r.data)
+}
diff --git a/frontend/src/types/models.ts b/frontend/src/types/models.ts
index 96a03da..e6dbaad 100644
--- a/frontend/src/types/models.ts
+++ b/frontend/src/types/models.ts
@@ -150,8 +150,10 @@ export interface SupportRole {
   id: string
   name: string
   description?: string
+  prompt?: string
   systemPrompt?: string
   categoryIds?: string[]
+  allowedMcpTools?: string[]
   enabled: boolean
   createTime?: string
   updateTime?: string
diff --git a/frontend/src/views/RoleManager.vue b/frontend/src/views/RoleManager.vue
index a14685e..a2dbeee 100644
--- a/frontend/src/views/RoleManager.vue
+++ b/frontend/src/views/RoleManager.vue
@@ -115,6 +115,40 @@
               </t-checkbox-group>
               <span v-else class="desc-text">暂无知识库分类，请先在知识库管理中创建分类</span>
             </t-form-item>
+
+            <t-form-item label="MCP 工具授权">
+              <div class="mcp-tools-box">
+                <t-checkbox
+                  v-model="allToolsSelected"
+                  :disabled="saving"
+                >
+                  全部授权（允许调用所有已接入的 MCP 工具）
+                </t-checkbox>
+                <t-loading size="small" :loading="mcpLoading">
+                  <t-checkbox-group
+                    v-if="!allToolsSelected && mcpServers.length"
+                    v-model="form.allowedMcpTools"
+                    class="mcp-tools-list"
+                  >
+                    <div v-for="s in mcpServers" :key="s.configId" class="mcp-server-group">
+                      <div class="mcp-server-name">{{ s.serverName }}</div>
+                      <t-checkbox
+                        v-for="t in s.tools"
+                        :key="t.name"
+                        :value="t.name"
+                        :disabled="saving"
+                      >
+                        <span class="mcp-tool-label">{{ t.rawName }}</span>
+                        <span v-if="t.description" class="mcp-tool-desc"> — {{ t.description }}</span>
+                      </t-checkbox>
+                    </div>
+                  </t-checkbox-group>
+                  <span v-else-if="!allToolsSelected && !mcpServers.length && !mcpLoading" class="desc-text">
+                    暂无已接入的 MCP 工具，请先在「MCP 服务管理」中配置并启用 Server
+                  </span>
+                </t-loading>
+              </div>
+            </t-form-item>
           </t-form>
 
           <div class="detail-footer">
@@ -130,7 +164,8 @@
 <script setup lang="ts">
 import { ref, reactive, computed, onMounted, watch } from 'vue'
 import { useCategoryStore } from '@/stores/category'
-import { getAllRoles, createRole, updateRole, deleteRole, updateRoleCategories } from '@/api/role'
+import { getAllRoles, createRole, updateRole, deleteRole, updateRoleCategories, updateRoleMcpTools } from '@/api/role'
+import { listAvailableMcpTools } from '@/api/mcp-server'
 import { toast } from '@/utils/toast'
 import { useConfirm } from '@/composables/useConfirm'
 
@@ -142,6 +177,8 @@ const roles = ref<any[]>([])
 const loading = ref(false)
 const saving = ref(false)
 const deleting = ref(false)
+const mcpServers = ref<any[]>([])
+const mcpLoading = ref(false)
 
 const mode = ref<'view' | 'create' | 'edit'>('view')
 const selectedId = ref<string | null>(null)
@@ -152,6 +189,7 @@ const form = reactive({
   prompt: '',
   enabled: true,
   categoryIds: [] as string[],
+  allowedMcpTools: [] as string[],
 })
 
 // ---- 脏检测快照（ref 保证响应式隔离） ----
@@ -164,6 +202,7 @@ function takeSnapshot(): string {
     prompt: form.prompt,
     enabled: form.enabled,
     categoryIds: [...form.categoryIds].sort(),
+    allowedMcpTools: [...form.allowedMcpTools].sort(),
   })
 }
 
@@ -173,6 +212,7 @@ function resetForm(): void {
   form.prompt = ''
   form.enabled = true
   form.categoryIds = []
+  form.allowedMcpTools = []
   snapshot.value = takeSnapshot()
 }
 
@@ -182,6 +222,7 @@ function setFormFromRole(role: any): void {
   form.prompt = role.prompt || ''
   form.enabled = role.enabled !== false
   form.categoryIds = [...(role.categoryIds || [])]
+  form.allowedMcpTools = [...(role.allowedMcpTools || [])]
   snapshot.value = takeSnapshot()
 }
 
@@ -189,11 +230,17 @@ const isDirty = computed(() => takeSnapshot() !== snapshot.value)
 
 // ---- 计算属性 ----
 const selectedRole = computed(() => roles.value.find(r => r.id === selectedId.value) ?? null)
+// 「全部授权」复选框：以 ["*"] 表示全部，取消则清空
+const allToolsSelected = computed<boolean>({
+  get: () => form.allowedMcpTools.includes('*'),
+  set: (val) => { form.allowedMcpTools = val ? ['*'] : [] },
+})
 
 // ---- 初始化 ----
 onMounted(() => {
   reload()
   categoryStore.loadCategories()
+  loadMcpTools()
 })
 
 // ---- 监听 selectedRole 变化：被他人删除时自动回退 ----
@@ -233,6 +280,23 @@ async function reload(): Promise<void> {
   }
 }
 
+// ---- 加载可用 MCP 工具 ----
+async function loadMcpTools(): Promise<void> {
+  mcpLoading.value = true
+  try {
+    const r = await listAvailableMcpTools()
+    if (r.success) {
+      mcpServers.value = r.data || []
+    } else {
+      toast('加载 MCP 工具列表失败：' + (r.message || '未知错误'), 'error')
+    }
+  } catch (e: any) {
+    toast('加载 MCP 工具列表失败：' + e.message, 'error')
+  } finally {
+    mcpLoading.value = false
+  }
+}
+
 // ---- 刷新（带脏检测守卫） ----
 async function handleRefresh(): Promise<void> {
   if (!(await guardDirty('刷新'))) return
@@ -326,6 +390,11 @@ async function handleSubmit(): Promise<void> {
       if (!catRes.success) {
         toast(catRes.message || '保存成功，但知识库授权失败', 'error')
       }
+      // 提交 MCP 工具授权
+      const mcpRes = await updateRoleMcpTools(roleId, [...form.allowedMcpTools])
+      if (!mcpRes.success) {
+        toast(mcpRes.message || '保存成功，但 MCP 工具授权失败', 'error')
+      }
     } else {
       toast('保存成功，但无法获取角色 ID，知识库授权未提交', 'warning')
     }
@@ -517,6 +586,44 @@ async function handleDelete(): Promise<void> {
   border-top: 1px solid var(--td-border-level-1-color);
 }
 
+/* ===== MCP 工具授权 ===== */
+.mcp-tools-box {
+  width: 100%;
+}
+
+.mcp-tools-list {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  margin-top: 8px;
+}
+
+.mcp-server-group {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+  padding: 8px 10px;
+  background: var(--td-bg-color-page);
+  border-radius: 8px;
+}
+
+.mcp-server-name {
+  font-size: 12px;
+  font-weight: 600;
+  color: var(--td-text-color-secondary);
+  margin-bottom: 2px;
+}
+
+.mcp-tool-label {
+  font-weight: 500;
+}
+
+.mcp-tool-desc {
+  font-size: 12px;
+  color: var(--td-text-color-placeholder);
+}
+
 /* ===== 响应式 ===== */
 @media (max-width: 1024px) {
   .role-sidebar {
diff --git a/src/main/java/com/wok/supportbot/app/AssistantApp.java b/src/main/java/com/wok/supportbot/app/AssistantApp.java
index de5f309..2388a4b 100644
--- a/src/main/java/com/wok/supportbot/app/AssistantApp.java
+++ b/src/main/java/com/wok/supportbot/app/AssistantApp.java
@@ -120,9 +120,9 @@ public class AssistantApp {
      * 获取 ChatClient（支持按角色过滤 MCP 工具），缓存上限 32 个，按 LRU 淘汰。
      */
     private ChatClient getChatClient(String appType, List<String> allowedMcpTools) {
-        // 空列表降级为 ["*"]（允许所有工具），与无参数版本行为一致
+        // 仅 null（无角色）降级为 ["*"]（向后兼容允许全部）；空列表表示有角色但未授权，保持空（不注册任何工具）
         final List<String> effectiveTools;
-        if (enableMcpTools && (allowedMcpTools == null || allowedMcpTools.isEmpty())) {
+        if (enableMcpTools && allowedMcpTools == null) {
             effectiveTools = List.of("*");
         } else {
             effectiveTools = allowedMcpTools;
diff --git a/src/main/java/com/wok/supportbot/app/ChatContext.java b/src/main/java/com/wok/supportbot/app/ChatContext.java
index 1f9d93e..cbbf405 100644
--- a/src/main/java/com/wok/supportbot/app/ChatContext.java
+++ b/src/main/java/com/wok/supportbot/app/ChatContext.java
@@ -15,7 +15,7 @@ import java.util.List;
  * @param chatId          会话 ID（多轮记忆键）
  * @param appType         ChatModel 应用类型（CHAT / RAG_REWRITE 等），默认 CHAT
  * @param systemPrompt    角色人设/系统提示词，可为 null
- * @param allowedMcpTools 允许的 MCP 工具名列表；null/空=允许所有；["*"]=全部
+ * @param allowedMcpTools 允许的 MCP 工具名列表；null=无角色允许全部；空=有角色但无授权（禁止）；["*"]=全部
  * @param categoryIds     知识库分类隔离范围，可为空（不限制）
  * @param rewriteStrategy RAG 查询重写策略（REWRITE / TRANSLATION / COMPRESSION / MULTI_QUERY），可为 null
  * @param enableRag       是否启用 RAG 检索；false=普通对话
diff --git a/src/main/java/com/wok/supportbot/controller/AiController.java b/src/main/java/com/wok/supportbot/controller/AiController.java
index 313fde3..40759ee 100644
--- a/src/main/java/com/wok/supportbot/controller/AiController.java
+++ b/src/main/java/com/wok/supportbot/controller/AiController.java
@@ -148,7 +148,7 @@ public class AiController {
         bindConversation(chatId, context);
         RoleScope scope = customerServiceRoleService.getRoleScope(context.roleId());
         return new ChatContext(message, chatId, "CHAT", resolveSystemPrompt(scope, systemPrompt),
-                scope.allowedMcpTools(), null, null, false, false);
+                scope.hasRole() ? scope.allowedMcpTools() : null, null, null, false, false);
     }
 
     /** 构造 RAG 对话的 ChatContext（含严格隔离判断：KbDenied 则 enableRag=false）。 */
@@ -160,7 +160,7 @@ public class AiController {
         String sys = resolveSystemPrompt(scope, systemPrompt);
         boolean enableRag = !isKbDenied(scope);
         List<Long> cats = resolveCategoryIds(scope, categoryId, categoryIds);
-        return new ChatContext(message, chatId, "CHAT", sys, scope.allowedMcpTools(), cats,
+        return new ChatContext(message, chatId, "CHAT", sys, scope.hasRole() ? scope.allowedMcpTools() : null, cats,
                 normalizeStrategy(rewriteStrategy), enableRag, false);
     }
 
diff --git a/src/main/java/com/wok/supportbot/controller/CustomerServiceRoleController.java b/src/main/java/com/wok/supportbot/controller/CustomerServiceRoleController.java
index 4874799..df5bfb5 100644
--- a/src/main/java/com/wok/supportbot/controller/CustomerServiceRoleController.java
+++ b/src/main/java/com/wok/supportbot/controller/CustomerServiceRoleController.java
@@ -1,5 +1,6 @@
 package com.wok.supportbot.controller;
 
+import com.wok.supportbot.app.AssistantApp;
 import com.wok.supportbot.rag.CategoryFilter;
 import com.wok.supportbot.service.CustomerServiceRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +26,8 @@ public class CustomerServiceRoleController {
     private CustomerServiceRoleService customerServiceRoleService;
     @Autowired
     private CategoryFilter categoryFilter;
+    @Autowired
+    private AssistantApp assistantApp;
 
     @GetMapping("/role/list")
     @PreAuthorize("hasRole('admin')")
@@ -121,6 +124,8 @@ public class CustomerServiceRoleController {
                 allowedMcpTools = List.of();
             }
             customerServiceRoleService.updateRoleMcpTools(roleId, allowedMcpTools);
+            // 清理 ChatClient 缓存，确保 MCP 工具授权改动即时生效
+            assistantApp.clearCache();
             return ResponseEntity.ok(Map.of("success", true, "message", "MCP 工具权限更新成功"));
         } catch (Exception e) {
             return ResponseEntity.status(500).body(Map.of("success", false, "message", "更新失败：" + e.getMessage()));
diff --git a/src/main/java/com/wok/supportbot/controller/McpServerConfigController.java b/src/main/java/com/wok/supportbot/controller/McpServerConfigController.java
index cb717bd..3271089 100644
--- a/src/main/java/com/wok/supportbot/controller/McpServerConfigController.java
+++ b/src/main/java/com/wok/supportbot/controller/McpServerConfigController.java
@@ -2,6 +2,7 @@ package com.wok.supportbot.controller;
 
 import com.wok.supportbot.config.McpClientManager;
 import com.wok.supportbot.entity.McpServerConfig;
+import com.wok.supportbot.mcp.McpToolCallbackAdapter;
 import com.wok.supportbot.service.McpServerConfigService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,7 +10,9 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -89,6 +92,52 @@ public class McpServerConfigController {
         }
     }
 
+    // ==================== 可用工具列表 ====================
+
+    /**
+     * 获取所有已启用 MCP Server 暴露的工具清单（按 Server 分组）。
+     * 工具名为带 mcp_ 前缀的注册名，与角色授权（allowed_mcp_tools）存储值一致，供「客服角色管理」授权 UI 使用。
+     *
+     * @return [{ configId, serverName, transportType, tools: [{ name, rawName, description }] }]
+     */
+    @GetMapping("/mcp-server/tools")
+    @PreAuthorize("hasRole('admin')")
+    public ResponseEntity<Map<String, Object>> listAvailableTools() {
+        try {
+            List<Map<String, Object>> servers = mcpClientManager.listAvailableTools();
+            List<Map<String, Object>> result = new ArrayList<>();
+            for (Map<String, Object> server : servers) {
+                Map<String, Object> out = new LinkedHashMap<>();
+                out.put("configId", server.get("config_id"));
+                out.put("serverName", server.get("name"));
+                out.put("transportType", server.get("transport_type"));
+
+                List<Map<String, Object>> tools = new ArrayList<>();
+                @SuppressWarnings("unchecked")
+                List<Map<String, Object>> rawTools = (List<Map<String, Object>>) server.get("tools");
+                if (rawTools != null) {
+                    String configId = (String) server.get("config_id");
+                    for (Map<String, Object> tool : rawTools) {
+                        String rawName = (String) tool.get("name");
+                        Map<String, Object> toolOut = new LinkedHashMap<>();
+                        toolOut.put("name", McpToolCallbackAdapter.buildToolName(configId, rawName));
+                        toolOut.put("rawName", rawName);
+                        toolOut.put("description", tool.get("description"));
+                        tools.add(toolOut);
+                    }
+                }
+                out.put("tools", tools);
+                result.add(out);
+            }
+            return ResponseEntity.ok(Map.of("success", true, "data", result));
+        } catch (Exception e) {
+            return ResponseEntity.status(500).body(Map.of(
+                    "success", false,
+                    "message", "获取工具列表失败：" + e.getMessage()
+            ));
+        }
+    }
+
     // ==================== 新建配置 ====================
 
     /**
diff --git a/src/main/java/com/wok/supportbot/controller/OpenApiController.java b/src/main/java/com/wok/supportbot/controller/OpenApiController.java
index 9de571d..8ca7306 100644
--- a/src/main/java/com/wok/supportbot/controller/OpenApiController.java
+++ b/src/main/java/com/wok/supportbot/controller/OpenApiController.java
@@ -223,7 +223,8 @@ public class OpenApiController {
         String strategy = (rewriteStrategy != null && !rewriteStrategy.isBlank())
                 ? rewriteStrategy : "MULTI_QUERY";
 
-        return new ChatContext(message, chatId, "CHAT", systemPrompt, scope.allowedMcpTools(),
+        return new ChatContext(message, chatId, "CHAT", systemPrompt,
+                scope.hasRole() ? scope.allowedMcpTools() : null,
                 catIds, strategy, useRag, streaming);
     }
 
diff --git a/src/main/java/com/wok/supportbot/mcp/McpToolCallbackAdapter.java b/src/main/java/com/wok/supportbot/mcp/McpToolCallbackAdapter.java
index 510ebfa..bdd26cd 100644
--- a/src/main/java/com/wok/supportbot/mcp/McpToolCallbackAdapter.java
+++ b/src/main/java/com/wok/supportbot/mcp/McpToolCallbackAdapter.java
@@ -30,6 +30,12 @@ public class McpToolCallbackAdapter {
 
     private final McpClientManager mcpClientManager;
 
+    /**
+     * MCP 工具注册名前缀，用于避免与内置工具名冲突。
+     * 角色授权（allowed_mcp_tools）中存储的工具名均带此前缀。
+     */
+    public static final String MCP_TOOL_PREFIX = "mcp_";
+
     /**
      * 单次对话请求中最大允许的 MCP 工具调用轮次，防止无限循环调用
      */
@@ -66,8 +72,8 @@ public class McpToolCallbackAdapter {
                 String description = (String) tool.get("description");
                 String inputSchema = (String) tool.get("inputSchema");
 
-                // 工具名加 mcp_ 前缀，避免与内置工具冲突
-                String prefixedName = "mcp_" + toolName;
+                // 工具名加 mcp_ 前缀 + configId 命名空间，避免内置工具冲突及跨 Server 同名工具冲突
+                String prefixedName = buildToolName(configId, toolName);
                 McpToolCallback callback = new McpToolCallback(
                         Long.parseLong(configId), prefixedName, toolName, description, inputSchema,
                         mcpClientManager, maxCallRounds);
@@ -108,4 +114,18 @@ public class McpToolCallbackAdapter {
                 .filter(cb -> allowedTools.contains(cb.getToolDefinition().name()))
                 .toArray(ToolCallback[]::new);
     }
+
+    /**
+     * 生成 MCP 工具的唯一注册名（含 configId 命名空间）。
+     * 不同 MCP Server 可能暴露同名工具，仅靠 "mcp_" + 原始名会冲突，
+     * 因此引入 configId 区分，形如 {@code mcp_1_get_weather}。
+     * 该名称同时用于 Spring AI 工具注册与角色授权（allowed_mcp_tools）存储。
+     *
+     * @param configId MCP Server 配置 ID（字符串）
+     * @param rawName  MCP Server 上的原始工具名
+     * @return 唯一注册名
+     */
+    public static String buildToolName(String configId, String rawName) {
+        return MCP_TOOL_PREFIX + configId + "_" + rawName;
+    }
 }
diff --git a/src/main/java/com/wok/supportbot/service/CustomerServiceRoleService.java b/src/main/java/com/wok/supportbot/service/CustomerServiceRoleService.java
index b0ddc8b..4a57a58 100644
--- a/src/main/java/com/wok/supportbot/service/CustomerServiceRoleService.java
+++ b/src/main/java/com/wok/supportbot/service/CustomerServiceRoleService.java
@@ -72,6 +72,9 @@ public class CustomerServiceRoleService {
             String roleId = String.valueOf(role.get("id"));
             role.put("categoryIds", categoryIdsByRole.getOrDefault(roleId, List.of()));
             role.put("categories", categoriesByRole.getOrDefault(roleId, List.of()));
+            // 解析 JSONB 字段为 List<String>，避免 PGobject 原样返回导致前端无法读取
+            Object rawMcp = role.remove("allowed_mcp_tools");
+            role.put("allowedMcpTools", parseAllowedMcpTools(rawMcp));
         }
         return roles;
     }