From 9074d15deb19064ce18428666b8d7d5fbdd8e586 Mon Sep 17 00:00:00 2001
From: Rick Ye <rick.ye@gz.questwork.com>
Date: Tue, 8 Sep 2026 00:23:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20CJK=20=E5=8A=A0=E7=B2=97=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88=EF=BC=88CommonMark=20flanking=20=E7=BC=BA=E9=99=B7?=
 =?UTF-8?q?=EF=BC=89+=20=E6=8B=89=E5=A4=A7=20Markdown=20=E6=AE=B5=E9=97=B4?=
 =?UTF-8?q?=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/desktop/package.json                     |  2 +
 .../src/renderer/src/components/Markdown.tsx  | 38 +++++++++++--------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 5b7efc4..4fc471c 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -30,6 +30,8 @@
     "react-dom": "19.2.8",
     "react-icons": "5.7.0",
     "react-markdown": "^10.1.0",
+    "remark-cjk-friendly": "^2.3.1",
+    "remark-cjk-friendly-gfm-strikethrough": "^2.3.1",
     "remark-gfm": "^4.0.1",
     "shadow-plugin": "2.1.0",
     "shiki": "^1.29.2",
diff --git a/apps/desktop/src/renderer/src/components/Markdown.tsx b/apps/desktop/src/renderer/src/components/Markdown.tsx
index 6337fbd..9272275 100644
--- a/apps/desktop/src/renderer/src/components/Markdown.tsx
+++ b/apps/desktop/src/renderer/src/components/Markdown.tsx
@@ -1,6 +1,8 @@
 import { memo, useEffect, useState, type ReactNode } from 'react'
 import ReactMarkdown, { type Components } from 'react-markdown'
 import remarkGfm from 'remark-gfm'
+import remarkCjkFriendly from 'remark-cjk-friendly'
+import remarkCjkFriendlyGfmStrikethrough from 'remark-cjk-friendly-gfm-strikethrough'
 import {
   useLLMOutput,
   type BlockMatch,
@@ -96,41 +98,41 @@ const LANG_ALIAS: Record<string, string> = {
 
 const mdComponents: Components = {
   p({ children }) {
-    return <p className="leading-normal">{children}</p>
+    return <p className="my-4 leading-normal">{children}</p>
   },
   h1({ children }) {
-    return <h3 className="mb-1 mt-3 text-[17px] font-semibold text-ink first:mt-0">{children}</h3>
+    return <h3 className="mb-2 mt-5 text-[17px] font-semibold text-ink first:mt-0">{children}</h3>
   },
   h2({ children }) {
-    return <h4 className="mb-1 mt-3 text-[15.5px] font-semibold text-ink first:mt-0">{children}</h4>
+    return <h4 className="mb-2 mt-5 text-[15.5px] font-semibold text-ink first:mt-0">{children}</h4>
   },
   h3({ children }) {
-    return <h5 className="mb-1 mt-2.5 text-[14.5px] font-semibold text-ink first:mt-0">{children}</h5>
+    return <h5 className="mb-1.5 mt-4 text-[14.5px] font-semibold text-ink first:mt-0">{children}</h5>
   },
   h4({ children }) {
-    return <h6 className="mb-1 mt-2.5 text-[14.5px] font-semibold text-ink first:mt-0">{children}</h6>
+    return <h6 className="mb-1.5 mt-4 text-[14.5px] font-semibold text-ink first:mt-0">{children}</h6>
   },
-  h5: ({ children }) => <h6 className="mb-1 mt-2.5 text-[14px] font-semibold text-ink">{children}</h6>,
-  h6: ({ children }) => <h6 className="mb-1 mt-2.5 text-[13.5px] font-semibold text-ink-2">{children}</h6>,
+  h5: ({ children }) => <h6 className="mb-1.5 mt-4 text-[14px] font-semibold text-ink">{children}</h6>,
+  h6: ({ children }) => <h6 className="mb-1.5 mt-4 text-[13.5px] font-semibold text-ink-2">{children}</h6>,
   ul({ children }) {
-    return <ul className="my-2 list-disc space-y-1.5 pl-5 marker:text-ink-3">{children}</ul>
+    return <ul className="my-4 list-disc space-y-2 pl-5 marker:text-ink-3">{children}</ul>
   },
   ol({ children }) {
-    return <ol className="my-2 list-decimal space-y-1.5 pl-5 marker:text-ink-3">{children}</ol>
+    return <ol className="my-4 list-decimal space-y-2 pl-5 marker:text-ink-3">{children}</ol>
   },
   li({ children }) {
     return <li className="leading-normal">{children}</li>
   },
   blockquote({ children }) {
     return (
-      <blockquote className="my-3 border-l-2 border-line pl-3 text-[13.5px] italic text-ink-3">
+      <blockquote className="my-4 border-l-2 border-line pl-3 text-[13.5px] italic text-ink-3">
         {children}
       </blockquote>
     )
   },
   table({ children }) {
     return (
-      <div className="my-3 overflow-x-auto">
+      <div className="my-4 overflow-x-auto">
         <table className="w-full border-collapse text-[13.5px]">{children}</table>
       </div>
     )
@@ -169,7 +171,7 @@ const mdComponents: Components = {
   },
   pre({ children }) {
     return (
-      <pre className="my-3 overflow-x-auto rounded-card bg-inset p-3 text-ink-2">{children}</pre>
+      <pre className="my-4 overflow-x-auto rounded-card bg-inset p-3 text-ink-2">{children}</pre>
     )
   },
   a({ children, href }) {
@@ -191,16 +193,22 @@ const mdComponents: Components = {
     return <del className="text-ink-3">{children}</del>
   },
   img({ src, alt }) {
-    return <img src={src} alt={alt} className="my-2 max-w-full rounded-card border border-line" />
+    return <img src={src} alt={alt} className="my-3 max-w-full rounded-card border border-line" />
   },
   hr() {
-    return <hr className="my-3 border-line" />
+    return <hr className="my-4 border-line" />
   }
 }
 
 const MarkdownComponent: LLMOutputComponent = ({ blockMatch }) => (
   <div className="space-y-5 text-base text-ink">
-    <ReactMarkdown remarkPlugins={[remarkGfm]} components={mdComponents}>
+    {/* remark-cjk-friendly：CommonMark 的 flanking 规则不认 CJK——`**` 紧邻
+      * 汉字与全角标点（如 出自**《书名》**）时无法开合加粗，解析层修复；
+      * 删除线同理（GFM ~~ 的伴随插件） */}
+    <ReactMarkdown
+      remarkPlugins={[remarkGfm, remarkCjkFriendly, remarkCjkFriendlyGfmStrikethrough]}
+      components={mdComponents}
+    >
       {blockMatch.output}
     </ReactMarkdown>
   </div>