Merge branch 'master' of http://192.168.0.200/knowledge-base-bj/deerflow-server into gzy_iframedf

frontend-web/src/components/workspace/chats/chat-box.tsx

@@ -16,7 +16,11 @@ import { apiFetch } from "@/core/api";
 import { getBackendBaseURL } from "@/core/config";
 import { isThreadRagModeLocked, useLocalSettings } from "@/core/settings";
 import { useSkills } from "@/core/skills/hooks";
-import { normalizeDisplaySources } from "@/core/skill-display/display-adapter";
+import type { SkillDisplayConfig } from "@/core/skills/type";
+import {
+  displayConfigFromResultSet,
+  normalizeDisplaySources,
+} from "@/core/skill-display/display-adapter";
 import {
   buildSkillDisplayMap,
   collectRuntimeDisplaySources,
@@ -621,9 +625,10 @@ function adaptBackendSourceWithSkillDisplay(
   if (!match) {
     return null;
   }
+  const display = findDisplayConfigForBackendSource(source, match.display);
   const normalized = normalizeDisplaySources(
-    buildPayloadAtPath(match.display.resultPath || "results", [rawItem]),
-    match.display,
+    buildPayloadAtPath(display.resultPath || "results", [rawItem]),
+    display,
   )[0];
   if (!normalized) {
     return null;
@@ -632,13 +637,27 @@ function adaptBackendSourceWithSkillDisplay(
     ...source,
     ...normalized,
     skillName: match.skillName,
-    mode: match.display.mode,
-    tableColumns: match.display.tableColumns,
+    mode: display.mode,
+    tableColumns: display.tableColumns,
     index: source.index,
     raw: source.raw,
   };
 }
 
+function findDisplayConfigForBackendSource(
+  source: BackendReferenceSource,
+  display: SkillDisplayConfig,
+) {
+  const resultSetKey = source.resultSetKey;
+  if (resultSetKey) {
+    const resultSet = display.resultSets?.find((item) => item.key === resultSetKey);
+    if (resultSet) {
+      return displayConfigFromResultSet(display, resultSet);
+    }
+  }
+  return { ...display, resultSets: [] };
+}
+
 function findBackendSourceDisplay(
   source: BackendReferenceSource,
   skillDisplayMap: ReturnType<typeof buildSkillDisplayMap>,