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

解决 artifact 预览组件冲突：mermaid 渲染(dhk-1) 与 markdown 锚点跳转(master) 取并集；package-lock.json 按 master 删除(项目用 pnpm)。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

frontend-web/src/components/workspace/artifacts/artifact-file-detail.tsx

@@ -14,6 +14,7 @@ import {
   XIcon,
 } from "lucide-react";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import type { AnchorHTMLAttributes, HTMLAttributes, ReactNode } from "react";
 import { toast } from "sonner";
 import { Streamdown } from "streamdown";
 
@@ -43,24 +44,29 @@ import {
   useArtifactContent,
   useUpdateArtifactContent,
 } from "@/core/artifacts/hooks";
-import { urlOfArtifact } from "@/core/artifacts/utils";
+import { resolveArtifactURL, urlOfArtifact } from "@/core/artifacts/utils";
 import { useI18n } from "@/core/i18n/hooks";
 import { downloadMarkdownAsDocx } from "@/core/scheduled-tasks/markdown-docx";
 import { installSkill } from "@/core/skills/api";
 import { streamdownPlugins } from "@/core/streamdown";
-import {
-  checkCodeFile,
-  getFileName,
-  isImageFile,
-} from "@/core/utils/files";
-import {
-  downloadMermaidSvgFile,
-  isMermaidFile,
-  openMermaidSvgInNewTab,
-  renderMermaidToSvg,
-} from "@/core/utils/mermaid";
+import {
+  checkCodeFile,
+  getFileName,
+  isImageFile,
+} from "@/core/utils/files";
+import {
+  downloadMermaidSvgFile,
+  isMermaidFile,
+  openMermaidSvgInNewTab,
+  renderMermaidToSvg,
+} from "@/core/utils/mermaid";
+import {
+  createMarkdownAnchorResolver,
+  injectInPageAnchorHandler,
+  isInPageAnchor,
+  scrollToInPageAnchor,
+} from "@/core/utils/markdown";
 import { getBackendBaseURL } from "@/core/config";
-import { resolveArtifactURL } from "@/core/artifacts/utils";
 import { env } from "@/env";
 import { desensitize } from "@/lib/desensitize";
 import { cn } from "@/lib/utils";
@@ -73,6 +79,12 @@ import { useArtifacts } from "./context";
 
 const SANDBOX_RESUME_EVENT = "workspace:sandbox-resume-autoscroll";
 
+function extractTextFromChildren(children: ReactNode): string {
+  if (typeof children === "string" || typeof children === "number") return String(children);
+  if (Array.isArray(children)) return children.map(extractTextFromChildren).join("");
+  return "";
+}
+
 function findScrollableArtifactElement(root: HTMLElement | null) {
   if (!root) {
     return null;
@@ -135,14 +147,14 @@ export function ArtifactFileDetail({
       return { isCodeFile: true, language: "markdown" };
     }
     return checkCodeFile(filepath);
-  }, [filepath, useWriteFileStreaming, isSkillFile]);
-  const isSupportPreview = useMemo(() => {
-    return (
-      language === "html" ||
-      language === "markdown" ||
-      language === "mermaid"
-    );
-  }, [language]);
+  }, [filepath, useWriteFileStreaming, isSkillFile]);
+  const isSupportPreview = useMemo(() => {
+    return (
+      language === "html" ||
+      language === "markdown" ||
+      language === "mermaid"
+    );
+  }, [language]);
   const { content, isApplyingEdit } = useArtifactContent({
     threadId,
     filepath: filepathFromProps,
@@ -160,12 +172,12 @@ export function ArtifactFileDetail({
   const displayContent = canEditArtifact ? draftContent : (content ?? "");
   const isHtmlStreaming = language === "html" && thread.isLoading;
   const hasMultipleArtifacts = (artifacts?.length ?? 0) > 1;
-  const fileTypeLabel = useMemo(() => {
-    if (isImageFile(filepath)) return "IMG";
-    if (isMermaidFile(filepath) || language === "mermaid") return "MMD";
-    if (language === "html") return "HTML";
-    if (language === "markdown") return "MD";
-    if (isSkillFile) return "SKILL";
+  const fileTypeLabel = useMemo(() => {
+    if (isImageFile(filepath)) return "IMG";
+    if (isMermaidFile(filepath) || language === "mermaid") return "MMD";
+    if (language === "html") return "HTML";
+    if (language === "markdown") return "MD";
+    if (isSkillFile) return "SKILL";
     if (language) return language.toUpperCase();
     return "FILE";
   }, [filepath, isSkillFile, language]);
@@ -434,16 +446,16 @@ export function ArtifactFileDetail({
       toast.error("文件内容为空，暂时无法打开");
       return;
     }
-    if (language === "mermaid") {
-      void openMermaidSvgInNewTab(source).catch((error) => {
-        console.error("Failed to open mermaid artifact:", error);
-        toast.error(error instanceof Error ? error.message : "Failed to open artifact");
-      });
-      return;
-    }
-    const blobType =
-      language === "html"
-        ? "text/html;charset=utf-8"
+    if (language === "mermaid") {
+      void openMermaidSvgInNewTab(source).catch((error) => {
+        console.error("Failed to open mermaid artifact:", error);
+        toast.error(error instanceof Error ? error.message : "Failed to open artifact");
+      });
+      return;
+    }
+    const blobType =
+      language === "html"
+        ? "text/html;charset=utf-8"
         : language === "markdown"
           ? "text/markdown;charset=utf-8"
           : "text/plain;charset=utf-8";
@@ -453,22 +465,22 @@ export function ArtifactFileDetail({
     window.setTimeout(() => URL.revokeObjectURL(url), 60_000);
   }, [displayContent, language]);
 
-  const handleDownloadWriteFile = useCallback(() => {
-    const source = displayContent ?? "";
+  const handleDownloadWriteFile = useCallback(() => {
+    const source = displayContent ?? "";
     if (!source.trim()) {
       toast.error("文件内容为空，暂时无法下载");
       return;
     }
-    if (language === "mermaid") {
-      void downloadMermaidSvgFile(source, filepath).catch((error) => {
-        console.error("Failed to download mermaid artifact:", error);
-        toast.error(error instanceof Error ? error.message : "Download failed");
-      });
-      return;
-    }
-    const blobType =
-      language === "html"
-        ? "text/html;charset=utf-8"
+    if (language === "mermaid") {
+      void downloadMermaidSvgFile(source, filepath).catch((error) => {
+        console.error("Failed to download mermaid artifact:", error);
+        toast.error(error instanceof Error ? error.message : "Download failed");
+      });
+      return;
+    }
+    const blobType =
+      language === "html"
+        ? "text/html;charset=utf-8"
         : language === "markdown"
           ? "text/markdown;charset=utf-8"
           : "text/plain;charset=utf-8";
@@ -587,27 +599,27 @@ export function ArtifactFileDetail({
               icon={SquareArrowOutUpRightIcon}
               label={t.common.openInNewWindow}
               tooltip={t.common.openInNewWindow}
-              onClick={async () => {
-                if (useWriteFileStreaming) {
-                  handleOpenWriteFileInNewTab();
-                  return;
-                }
-                if (language === "mermaid") {
-                  try {
-                    await openMermaidSvgInNewTab(displayContent ?? "");
-                  } catch (error) {
-                    console.error(error);
-                    toast.error(
-                      error instanceof Error
-                        ? error.message
-                        : "Failed to open artifact",
-                    );
-                  }
-                  return;
-                }
-                try {
-                  await openArtifactInNewTab({
-                    filepath,
+              onClick={async () => {
+                if (useWriteFileStreaming) {
+                  handleOpenWriteFileInNewTab();
+                  return;
+                }
+                if (language === "mermaid") {
+                  try {
+                    await openMermaidSvgInNewTab(displayContent ?? "");
+                  } catch (error) {
+                    console.error(error);
+                    toast.error(
+                      error instanceof Error
+                        ? error.message
+                        : "Failed to open artifact",
+                    );
+                  }
+                  return;
+                }
+                try {
+                  await openArtifactInNewTab({
+                    filepath,
                     threadId,
                     isMock,
                     publicShareCode,
@@ -652,27 +664,27 @@ export function ArtifactFileDetail({
               icon={DownloadIcon}
               label={t.common.download}
               tooltip={t.common.download}
-              onClick={async () => {
-                if (useWriteFileStreaming) {
-                  handleDownloadWriteFile();
-                  return;
-                }
-                if (language === "mermaid") {
-                  try {
-                    await downloadMermaidSvgFile(displayContent ?? "", filepath);
-                  } catch (error) {
-                    console.error(error);
-                    toast.error(
-                      error instanceof Error
-                        ? error.message
-                        : "Download failed",
-                    );
-                  }
-                  return;
-                }
-                try {
-                  await downloadArtifactFile({
-                    filepath,
+              onClick={async () => {
+                if (useWriteFileStreaming) {
+                  handleDownloadWriteFile();
+                  return;
+                }
+                if (language === "mermaid") {
+                  try {
+                    await downloadMermaidSvgFile(displayContent ?? "", filepath);
+                  } catch (error) {
+                    console.error(error);
+                    toast.error(
+                      error instanceof Error
+                        ? error.message
+                        : "Download failed",
+                    );
+                  }
+                  return;
+                }
+                try {
+                  await downloadArtifactFile({
+                    filepath,
                     threadId,
                     isMock,
                     publicShareCode,
@@ -717,15 +729,15 @@ export function ArtifactFileDetail({
             <ArrowDownIcon className="size-4" />
             滑动到底部并继续自动下滑
           </button>
-        )}
-        {isSupportPreview &&
-          viewMode === "preview" &&
-          (language === "markdown" ||
-            language === "html" ||
-            language === "mermaid") && (
-              <ArtifactFilePreview
-                content={desensitize(displayContent ?? "")}
-                language={language ?? "text"}
+        )}
+        {isSupportPreview &&
+          viewMode === "preview" &&
+          (language === "markdown" ||
+            language === "html" ||
+            language === "mermaid") && (
+              <ArtifactFilePreview
+                content={desensitize(displayContent ?? "")}
+                language={language ?? "text"}
                 threadId={threadId}
                 publicShareCode={publicShareCode}
                 animated={showPreviewSwitchPulse}
@@ -821,64 +833,127 @@ export function ArtifactFilePreview({
   publicShareCode?: string;
   animated?: boolean;
   activeCursor?: boolean;
-}) {
-  const [htmlPreviewUrl, setHtmlPreviewUrl] = useState<string>();
-  const [mermaidSvg, setMermaidSvg] = useState<string | null>(null);
-  const [mermaidError, setMermaidError] = useState<string | null>(null);
+}) {
+  const [htmlPreviewUrl, setHtmlPreviewUrl] = useState<string>();
+  const [mermaidSvg, setMermaidSvg] = useState<string | null>(null);
+  const [mermaidError, setMermaidError] = useState<string | null>(null);
+  const markdownComponents = useMemo(() => {
+    const anchorResolver = createMarkdownAnchorResolver(content ?? "");
+    const heading = (level: 1 | 2 | 3 | 4 | 5 | 6) => {
+      const Tag = `h${level}` as const;
+      return ({ children, id, ...props }: HTMLAttributes<HTMLHeadingElement>) => (
+        <Tag id={id ?? anchorResolver.getHeadingId(level, extractTextFromChildren(children))} {...props}>
+          {children}
+        </Tag>
+      );
+    };
 
-  useEffect(() => {
-    if (language !== "html") {
-      setHtmlPreviewUrl(undefined);
-      return;
+    return {
+      h1: heading(1),
+      h2: heading(2),
+      h3: heading(3),
+      h4: heading(4),
+      h5: heading(5),
+      h6: heading(6),
+      a: (props: AnchorHTMLAttributes<HTMLAnchorElement>) => {
+        if (typeof props.children === "string" && /^citation:(.+)$/.test(props.children)) {
+          return <ArtifactLink {...props} />;
+        }
+        const { className, ...rest } = props;
+        const resolvedHref = anchorResolver.resolveHref(
+          props.href,
+          extractTextFromChildren(props.children),
+        );
+        if (resolvedHref === null) {
+          return (
+            <span
+              className={cn(
+                "text-primary/80 decoration-dotted underline underline-offset-2 cursor-not-allowed",
+                className,
+              )}
+              title="未在当前 Markdown 中找到对应章节"
+            >
+              {props.children}
+            </span>
+          );
+        }
+        const finalHref = resolvedHref ?? props.href;
+        return (
+          <ArtifactLink
+            {...rest}
+            className={className}
+            href={finalHref}
+            onClick={(event) => {
+              if (isInPageAnchor(finalHref)) {
+                event.preventDefault();
+                scrollToInPageAnchor(event.currentTarget, finalHref);
+              }
+              rest.onClick?.(event);
+            }}
+          />
+        );
+      },
+    };
+  }, [content]);
+
+  useEffect(() => {
+    if (language !== "html") {
+      setHtmlPreviewUrl(undefined);
+      return;
     }
 
     // 必须带 charset=utf-8：blob: URL 的 Content-Type 不含 charset 时，iframe 会按
     // 系统默认编码(中文 Windows 常为 GBK/Latin-1)解码,模型生成的 HTML 若没写
     // <meta charset> 就会中文乱码。与下方下载/新窗口打开的 blobType 保持一致。
-    const blob = new Blob([content ?? ""], { type: "text/html;charset=utf-8" });
+    // Intercept in-page anchor clicks so they scroll within the iframe instead
+    // of navigating the sandboxed blob: document (which blanks the frame).
+    const blob = new Blob([injectInPageAnchorHandler(content ?? "")], {
+      type: "text/html;charset=utf-8",
+    });
     const url = URL.createObjectURL(blob);
     setHtmlPreviewUrl(url);
 
     return () => {
-      URL.revokeObjectURL(url);
-    };
-  }, [content, language]);
-
-  useEffect(() => {
-    if (language !== "mermaid") {
-      setMermaidSvg(null);
-      setMermaidError(null);
-      return;
-    }
-
-    let cancelled = false;
-    setMermaidSvg(null);
-    setMermaidError(null);
-
-    void renderMermaidToSvg(content ?? "")
-      .then((svg) => {
-        if (!cancelled) {
-          setMermaidSvg(svg);
-        }
-      })
-      .catch((error) => {
-        console.error("Failed to render mermaid preview:", error);
-        if (!cancelled) {
-          setMermaidError(
-            error instanceof Error ? error.message : "Mermaid 渲染失败",
-          );
-        }
-      });
-
-    return () => {
-      cancelled = true;
-    };
-  }, [content, language]);
+      URL.revokeObjectURL(url);
+    };
+  }, [content, language]);
+
+  useEffect(() => {
+    if (language !== "mermaid") {
+      setMermaidSvg(null);
+      setMermaidError(null);
+      return;
+    }
+
+    let cancelled = false;
+    setMermaidSvg(null);
+    setMermaidError(null);
+
+    void renderMermaidToSvg(content ?? "")
+      .then((svg) => {
+        if (!cancelled) {
+          setMermaidSvg(svg);
+        }
+      })
+      .catch((error) => {
+        console.error("Failed to render mermaid preview:", error);
+        if (!cancelled) {
+          setMermaidError(
+            error instanceof Error ? error.message : "Mermaid 渲染失败",
+          );
+        }
+      });
+
+    return () => {
+      cancelled = true;
+    };
+  }, [content, language]);
 
   if (language === "markdown") {
     return (
       <div
         data-artifact-preview-scroll
+        data-markdown-anchor-root
         className={cn(
           "size-full overflow-auto px-5 py-4",
           animated && "animate-[sandbox-preview-enter_320ms_ease-out]",
@@ -888,7 +963,7 @@ export function ArtifactFilePreview({
           className="size-full"
           {...streamdownPlugins}
           components={{
-            a: ArtifactLink,
+            ...markdownComponents,
             img: (props) => (
               <SandboxPreviewImage
                 {...props}
@@ -907,9 +982,9 @@ export function ArtifactFilePreview({
     );
   }
 
-  if (language === "html") {
-    return (
-      <iframe
+  if (language === "html") {
+    return (
+      <iframe
         className={cn(
           "size-full bg-white",
           animated && "animate-[sandbox-preview-enter_320ms_ease-out]",
@@ -918,41 +993,41 @@ export function ArtifactFilePreview({
         sandbox="allow-scripts allow-forms"
         src={htmlPreviewUrl}
       />
-    );
-  }
-
-  if (language === "mermaid") {
-    return (
-      <div
-        data-artifact-preview-scroll
-        className={cn(
-          "size-full overflow-auto bg-[#fcfdfc] px-5 py-4",
-          animated && "animate-[sandbox-preview-enter_320ms_ease-out]",
-        )}
-      >
-        {mermaidSvg ? (
-          <div
-            className="mx-auto flex min-h-full items-start justify-center rounded-2xl border border-slate-200 bg-white p-4 shadow-sm"
-            dangerouslySetInnerHTML={{ __html: mermaidSvg }}
-          />
-        ) : mermaidError ? (
-          <div className="space-y-3">
-            <div className="rounded-xl border border-rose-200 bg-rose-50 px-4 py-3 text-sm text-rose-700">
-              {mermaidError}
-            </div>
-            <pre className="whitespace-pre-wrap break-words rounded-xl bg-slate-100 p-4 text-xs text-slate-700">
-              {content ?? ""}
-            </pre>
-          </div>
-        ) : (
-          <div className="text-muted-foreground flex size-full items-center justify-center gap-2 text-sm">
-            <LoaderIcon className="size-5 animate-spin" />
-            正在生成图表预览
-          </div>
-        )}
-      </div>
-    );
-  }
-
-  return null;
-}
+    );
+  }
+
+  if (language === "mermaid") {
+    return (
+      <div
+        data-artifact-preview-scroll
+        className={cn(
+          "size-full overflow-auto bg-[#fcfdfc] px-5 py-4",
+          animated && "animate-[sandbox-preview-enter_320ms_ease-out]",
+        )}
+      >
+        {mermaidSvg ? (
+          <div
+            className="mx-auto flex min-h-full items-start justify-center rounded-2xl border border-slate-200 bg-white p-4 shadow-sm"
+            dangerouslySetInnerHTML={{ __html: mermaidSvg }}
+          />
+        ) : mermaidError ? (
+          <div className="space-y-3">
+            <div className="rounded-xl border border-rose-200 bg-rose-50 px-4 py-3 text-sm text-rose-700">
+              {mermaidError}
+            </div>
+            <pre className="whitespace-pre-wrap break-words rounded-xl bg-slate-100 p-4 text-xs text-slate-700">
+              {content ?? ""}
+            </pre>
+          </div>
+        ) : (
+          <div className="text-muted-foreground flex size-full items-center justify-center gap-2 text-sm">
+            <LoaderIcon className="size-5 animate-spin" />
+            正在生成图表预览
+          </div>
+        )}
+      </div>
+    );
+  }
+
+  return null;
+}