feat: enhance chat response handling with external links and user info

ctrlz526 · ctrlz526 · commit e77ccc729d06 · 2025-08-10T11:20:38.000+08:00
(cherry picked from commit 312862a)
diff --git a/packages/global/core/chat/type.d.ts b/packages/global/core/chat/type.d.ts
@@ -131,6 +131,7 @@ export type ResponseTagItemType = {
   totalQuoteList?: SearchDataResponseItemType[];
   llmModuleAccount?: number;
   historyPreviewLength?: number;
+  externalLinkList?: { name: string; url: string }[];
 };
 
 export type ChatItemType = (UserChatItemType | SystemChatItemType | AIChatItemType) & {
diff --git a/packages/global/core/workflow/runtime/type.d.ts b/packages/global/core/workflow/runtime/type.d.ts
@@ -51,6 +51,10 @@ export type ChatDispatchProps = {
     isChildApp?: boolean;
   };
   runningUserInfo: {
+    username: string;
+    teamName: string;
+    memberName: string;
+    contact: string;
     teamId: string;
     tmbId: string;
   };
diff --git a/packages/service/core/workflow/dispatch/child/runApp.ts b/packages/service/core/workflow/dispatch/child/runApp.ts
@@ -20,7 +20,10 @@ import { authAppByTmbId } from '../../../../support/permission/app/auth';
 import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
 import { getAppVersionById } from '../../../app/version/controller';
 import { parseUrlToFileType } from '@fastgpt/global/common/file/tools';
-import { getUserChatInfoAndAuthTeamPoints } from '../../../../support/permission/auth/team';
+import {
+  getUserChatInfoAndAuthTeamPoints,
+  getRunningUserInfoByTmbId
+} from '../../../../support/permission/auth/team';
 
 type Props = ModuleDispatchProps<{
   [NodeInputKeyEnum.userChatInput]: string;
@@ -147,6 +150,7 @@ export const dispatchRunAppNode = async (props: Props): Promise<Response> => {
         tmbId: String(appData.tmbId),
         isChildApp: true
       },
+      runningUserInfo: await getRunningUserInfoByTmbId(appData.tmbId),
       runtimeNodes,
       runtimeEdges,
       histories: chatHistories,
diff --git a/packages/service/core/workflow/dispatch/child/runTool.ts b/packages/service/core/workflow/dispatch/child/runTool.ts
@@ -90,6 +90,10 @@ export const dispatchRunTool = async (props: RunToolProps): Promise<RunToolRespo
         systemVar: {
           user: {
             id: variables.userId,
+            userId: runningUserInfo.username,
+            rank: runningUserInfo.contact,
+            membername: runningUserInfo.memberName,
+            teamName: runningUserInfo.teamName,
             teamId: runningUserInfo.teamId,
             name: runningUserInfo.tmbId
           },
diff --git a/packages/service/support/permission/auth/team.ts b/packages/service/support/permission/auth/team.ts
@@ -30,3 +30,33 @@ export async function getUserChatInfoAndAuthTeamPoints(tmbId: string) {
     }
   };
 }
+
+export async function getRunningUserInfoByTmbId(tmbId: string) {
+  if (tmbId) {
+    const tmb = await MongoTeamMember.findById(tmbId, 'teamId name userId') // team_members name is the user's name
+      .populate<{ team: TeamSchema; user: UserModelSchema }>([
+        {
+          path: 'team',
+          select: 'name'
+        },
+        {
+          path: 'user',
+          select: 'username contact'
+        }
+      ])
+      .lean();
+
+    if (!tmb) return Promise.reject(TeamErrEnum.notUser);
+
+    return {
+      username: tmb.user.username,
+      teamName: tmb.team.name,
+      memberName: tmb.name,
+      contact: tmb.user.contact || '',
+      teamId: tmb.teamId,
+      tmbId: tmb._id
+    };
+  }
+
+  return Promise.reject(TeamErrEnum.notUser);
+}
diff --git a/projects/app/src/components/core/chat/ChatContainer/ChatBox/components/ResponseTags.tsx b/projects/app/src/components/core/chat/ChatContainer/ChatBox/components/ResponseTags.tsx
@@ -43,7 +43,8 @@ const ResponseTags = ({
   const {
     totalQuoteList: quoteList = [],
     llmModuleAccount = 0,
-    historyPreviewLength = 0
+    historyPreviewLength = 0,
+    externalLinkList = []
   } = useMemo(() => addStatisticalDataToHistoryItem(historyItem), [historyItem]);
 
   const [quoteFolded, setQuoteFolded] = useState<boolean>(true);
@@ -68,38 +69,53 @@ const ResponseTags = ({
     ? quoteListRef.current.scrollHeight > (isPc ? 50 : 55)
     : true;
 
-  const sourceList = useMemo(() => {
-    return Object.values(
-      quoteList.reduce((acc: Record<string, SearchDataResponseItemType[]>, cur) => {
-        if (!acc[cur.collectionId]) {
-          acc[cur.collectionId] = [cur];
-        }
-        return acc;
-      }, {})
-    )
-      .flat()
-      .map((item) => ({
-        sourceName: item.sourceName,
-        sourceId: item.sourceId,
-        icon: item.imageId
-          ? 'core/dataset/imageFill'
-          : getSourceNameIcon({ sourceId: item.sourceId, sourceName: item.sourceName }),
-        collectionId: item.collectionId,
-        datasetId: item.datasetId
-      }));
+  // Dataset citation render items
+  const datasetCitationList = useMemo(() => {
+    // Keep first item per collectionId and preserve first-seen order
+    const firstByCollection = new Map<string, SearchDataResponseItemType>();
+    quoteList.forEach((cur) => {
+      if (!firstByCollection.has(cur.collectionId)) {
+        firstByCollection.set(cur.collectionId, cur);
+      }
+    });
+    return Array.from(firstByCollection.values()).map((item) => ({
+      itemType: 'dataset' as const,
+      sourceName: item.sourceName,
+      sourceId: item.sourceId,
+      icon: item.imageId
+        ? 'core/dataset/imageFill'
+        : getSourceNameIcon({ sourceId: item.sourceId, sourceName: item.sourceName }),
+      collectionId: item.collectionId,
+      datasetId: item.datasetId
+    }));
   }, [quoteList]);
 
-  const notEmptyTags =
-    quoteList.length > 0 ||
-    (llmModuleAccount === 1 && notSharePage) ||
-    (llmModuleAccount > 1 && notSharePage) ||
-    (isPc && durationSeconds > 0) ||
-    notSharePage;
+  // Merge dataset citations and external link references for unified rendering
+  type RenderCitationItem =
+    | {
+        itemType: 'dataset';
+        sourceName: string;
+        sourceId?: string;
+        icon: string;
+        collectionId: string;
+        datasetId: string;
+      }
+    | { itemType: 'link'; name: string; url: string };
+
+  const citationRenderList: RenderCitationItem[] = useMemo(() => {
+    const linkItems: RenderCitationItem[] = externalLinkList.map((r) => ({
+      ...r,
+      itemType: 'link'
+    }));
+    return [...datasetCitationList, ...linkItems];
+  }, [datasetCitationList, externalLinkList]);
+
+  const notEmptyTags = notSharePage || quoteList.length > 0 || (isPc && durationSeconds > 0);
 
   return !showTags ? null : (
     <>
       {/* quote */}
-      {sourceList.length > 0 && (
+      {citationRenderList.length > 0 && (
         <>
           <Flex justifyContent={'space-between'} alignItems={'center'}>
             <Box width={'100%'}>
@@ -143,9 +159,16 @@ const ResponseTags = ({
                 : {}
             }
           >
-            {sourceList.map((item, index) => {
+            {citationRenderList.map((item, index) => {
+              const key = item.itemType === 'dataset' ? item.collectionId : `${item.url}-${index}`;
+              const label = item.itemType === 'dataset' ? item.sourceName : item.name;
               return (
-                <MyTooltip key={item.collectionId} label={t('common:core.chat.quote.Read Quote')}>
+                <MyTooltip
+                  key={key}
+                  label={
+                    item.itemType === 'dataset' ? t('common:core.chat.quote.Read Quote') : item.url
+                  }
+                >
                   <Flex
                     alignItems={'center'}
                     fontSize={'xs'}
@@ -161,7 +184,16 @@ const ResponseTags = ({
                     cursor={'pointer'}
                     onClick={(e) => {
                       e.stopPropagation();
-                      onOpenCiteModal(item);
+                      if (item.itemType === 'dataset') {
+                        onOpenCiteModal({
+                          collectionId: item.collectionId,
+                          sourceId: item.sourceId,
+                          sourceName: item.sourceName,
+                          datasetId: item.datasetId
+                        });
+                      } else {
+                        window.open(item.url, '_blank');
+                      }
                     }}
                     height={6}
                   >
@@ -177,14 +209,16 @@ const ResponseTags = ({
                       {index + 1}
                     </Flex>
                     <Flex px={1.5}>
-                      <MyIcon name={item.icon as any} mr={1} flexShrink={0} w={'12px'} />
+                      {item.itemType === 'dataset' && (
+                        <MyIcon name={item.icon as any} mr={1} flexShrink={0} w={'12px'} />
+                      )}
                       <Box
                         className="textEllipsis3"
                         wordBreak={'break-all'}
                         flex={'1 0 0'}
                         fontSize={'mini'}
                       >
-                        {item.sourceName}
+                        {label}
                       </Box>
                     </Flex>
                   </Flex>
diff --git a/projects/app/src/global/core/chat/utils.ts b/projects/app/src/global/core/chat/utils.ts
@@ -33,20 +33,60 @@ export const getFlatAppResponses = (res: ChatHistoryItemResType[]): ChatHistoryI
 };
 export function addStatisticalDataToHistoryItem(historyItem: ChatItemType) {
   if (historyItem.obj !== ChatRoleEnum.AI) return historyItem;
-  if (historyItem.totalQuoteList !== undefined) return historyItem;
-  if (!historyItem.responseData) return historyItem;
 
   // Flat children
   const flatResData = getFlatAppResponses(historyItem.responseData || []);
 
+  const llmModuleAccount = flatResData.filter(isLLMNode).length;
+  const totalQuoteList = flatResData
+    .filter((item) => item.moduleType === FlowNodeTypeEnum.datasetSearchNode)
+    .map((item) => item.quoteList)
+    .flat()
+    .filter(Boolean) as SearchDataResponseItemType[];
+  const historyPreviewLength = flatResData.find(isLLMNode)?.historyPreview?.length;
+
+  // Extract external link references from final tool responses in responseData
+  const externalLinkList = (() => {
+    try {
+      const refs: { name: string; url: string }[] = [];
+      const dedupe = new Set<string>();
+      // Also parse from flattened flow node responses (toolRes.referenceDocuments)
+      flatResData.forEach((res: ChatHistoryItemResType) => {
+        const docs = res?.toolRes?.referenceDocuments;
+        if (docs) {
+          docs.forEach((doc: { name: string; webUrl?: string; dingUrl?: string }) => {
+            const baseName = doc?.name || '';
+            const webUrl = doc?.webUrl;
+            const dingUrl = doc?.dingUrl;
+            const push = (name: string, url?: string) => {
+              if (!url) return;
+              const key = `${name}::${url}`;
+              if (!dedupe.has(key)) {
+                dedupe.add(key);
+                refs.push({ name, url });
+              }
+            };
+            if (baseName) {
+              push(`[Web] ${baseName}`, webUrl);
+              push(`[Dingding] ${baseName}`, dingUrl);
+            } else {
+              push('[Web]', webUrl);
+              push('[Dingding]', dingUrl);
+            }
+          });
+        }
+      });
+      return refs;
+    } catch (e) {
+      return [] as { name: string; url: string }[];
+    }
+  })();
+
   return {
     ...historyItem,
-    llmModuleAccount: flatResData.filter(isLLMNode).length,
-    totalQuoteList: flatResData
-      .filter((item) => item.moduleType === FlowNodeTypeEnum.datasetSearchNode)
-      .map((item) => item.quoteList)
-      .flat()
-      .filter(Boolean) as SearchDataResponseItemType[],
-    historyPreviewLength: flatResData.find(isLLMNode)?.historyPreview?.length
+    ...(llmModuleAccount ? { llmModuleAccount } : {}),
+    ...(totalQuoteList.length ? { totalQuoteList } : {}),
+    ...(historyPreviewLength ? { historyPreviewLength } : {}),
+    ...(externalLinkList.length ? { externalLinkList } : {})
   };
 }
diff --git a/projects/app/src/pages/api/core/chat/chatTest.ts b/projects/app/src/pages/api/core/chat/chatTest.ts
@@ -10,7 +10,10 @@ import { UsageSourceEnum } from '@fastgpt/global/support/wallet/usage/constants'
 import type { AIChatItemType, UserChatItemType } from '@fastgpt/global/core/chat/type';
 import { authApp } from '@fastgpt/service/support/permission/app/auth';
 import { dispatchWorkFlow } from '@fastgpt/service/core/workflow/dispatch';
-import { getUserChatInfoAndAuthTeamPoints } from '@fastgpt/service/support/permission/auth/team';
+import {
+  getUserChatInfoAndAuthTeamPoints,
+  getRunningUserInfoByTmbId
+} from '@fastgpt/service/support/permission/auth/team';
 import type { StoreEdgeItemType } from '@fastgpt/global/core/workflow/type/edge';
 import {
   concatHistories,
@@ -184,10 +187,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
         teamId: app.teamId,
         tmbId: app.tmbId
       },
-      runningUserInfo: {
-        teamId,
-        tmbId
-      },
+      runningUserInfo: await getRunningUserInfoByTmbId(tmbId),
 
       chatId,
       responseChatItemId,
diff --git a/projects/app/src/pages/api/core/workflow/debug.ts b/projects/app/src/pages/api/core/workflow/debug.ts
@@ -4,7 +4,10 @@ import { UsageSourceEnum } from '@fastgpt/global/support/wallet/usage/constants'
 import { authApp } from '@fastgpt/service/support/permission/app/auth';
 import { dispatchWorkFlow } from '@fastgpt/service/core/workflow/dispatch';
 import { authCert } from '@fastgpt/service/support/permission/auth/common';
-import { getUserChatInfoAndAuthTeamPoints } from '@fastgpt/service/support/permission/auth/team';
+import {
+  getUserChatInfoAndAuthTeamPoints,
+  getRunningUserInfoByTmbId
+} from '@fastgpt/service/support/permission/auth/team';
 import type { PostWorkflowDebugProps, PostWorkflowDebugResponse } from '@/global/core/workflow/api';
 import { NextAPI } from '@/service/middleware/entry';
 import { ReadPermissionVal } from '@fastgpt/global/support/permission/constant';
@@ -63,10 +66,7 @@ async function handler(
         teamId: app.teamId,
         tmbId: app.tmbId
       },
-      runningUserInfo: {
-        teamId,
-        tmbId
-      },
+      runningUserInfo: await getRunningUserInfoByTmbId(tmbId),
       runtimeNodes: nodes,
       runtimeEdges: edges,
       lastInteractive,
diff --git a/projects/app/src/pages/api/v1/chat/completions.ts b/projects/app/src/pages/api/v1/chat/completions.ts
@@ -34,7 +34,10 @@ import {
   removeEmptyUserInput
 } from '@fastgpt/global/core/chat/utils';
 import { updateApiKeyUsage } from '@fastgpt/service/support/openapi/tools';
-import { getUserChatInfoAndAuthTeamPoints } from '@fastgpt/service/support/permission/auth/team';
+import {
+  getUserChatInfoAndAuthTeamPoints,
+  getRunningUserInfoByTmbId
+} from '@fastgpt/service/support/permission/auth/team';
 import { AuthUserTypeEnum } from '@fastgpt/global/support/permission/constant';
 import { MongoApp } from '@fastgpt/service/core/app/schema';
 import { type AppSchema } from '@fastgpt/global/core/app/type';
@@ -286,10 +289,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
             teamId: String(app.teamId),
             tmbId: String(app.tmbId)
           },
-          runningUserInfo: {
-            teamId,
-            tmbId
-          },
+          runningUserInfo: await getRunningUserInfoByTmbId(app.tmbId),
           uid: String(outLinkUserId || tmbId),
 
           chatId,
diff --git a/projects/app/src/pages/api/v2/chat/completions.ts b/projects/app/src/pages/api/v2/chat/completions.ts
@@ -34,7 +34,10 @@ import {
   removeEmptyUserInput
 } from '@fastgpt/global/core/chat/utils';
 import { updateApiKeyUsage } from '@fastgpt/service/support/openapi/tools';
-import { getUserChatInfoAndAuthTeamPoints } from '@fastgpt/service/support/permission/auth/team';
+import {
+  getUserChatInfoAndAuthTeamPoints,
+  getRunningUserInfoByTmbId
+} from '@fastgpt/service/support/permission/auth/team';
 import { AuthUserTypeEnum } from '@fastgpt/global/support/permission/constant';
 import { MongoApp } from '@fastgpt/service/core/app/schema';
 import { type AppSchema } from '@fastgpt/global/core/app/type';
@@ -285,10 +288,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
             teamId: String(app.teamId),
             tmbId: String(app.tmbId)
           },
-          runningUserInfo: {
-            teamId,
-            tmbId
-          },
+          runningUserInfo: await getRunningUserInfoByTmbId(app.tmbId),
           uid: String(outLinkUserId || tmbId),
 
           chatId,
diff --git a/projects/app/src/service/core/app/utils.ts b/projects/app/src/service/core/app/utils.ts
diff --git a/projects/app/src/service/support/mcp/utils.ts b/projects/app/src/service/support/mcp/utils.ts
