From d74fbce137fef36d71645e9597decd8b70656e25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=B2=E6=82=A6?= <shiyue@hdzxbj.com>
Date: Tue, 3 Feb 2026 10:55:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E6=94=AF=E6=8C=81=E7=9A=84?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  -  ```svg<svg... ✅
  -  ```svg <svg... ✅
  -  ```xml<svg... ✅
  -  ```xml <svg... ✅
  -  ``` xml<svg... ✅
  -  ``` svg<svg... ✅
  -  ```<svg... ✅（无语言标识）

  这样无论 LLM 输出哪种格式，都能正确实时绘制和复制图片到剪贴板了。
---
 js/core/app-shell.js         | 6 ++++--
 js/modules/product-canvas.js | 2 +-
 js/modules/swot.js           | 2 +-
 js/modules/thinksvg.js       | 4 ++--
 js/utils.js                  | 9 +++++----
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/js/core/app-shell.js b/js/core/app-shell.js
index eea98f6..8b6ee5e 100644
--- a/js/core/app-shell.js
+++ b/js/core/app-shell.js
@@ -1325,8 +1325,9 @@
         };
       }
       const svgCtx = streamState.svg;
+      // 兼容 ```svg、```xml、``` xml、``` svg 等格式
       const startPattern =
-        manifest.artifact?.startPattern || /```(?:svg)?\s*<svg/i;
+        manifest.artifact?.startPattern || /```\s*(?:svg|xml)?\s*<svg/i;
       if (!svgCtx.started) {
         const match = fullContent.match(startPattern);
         if (match) {
@@ -1347,7 +1348,8 @@
       }
 
       const svgSection = fullContent.substring(svgCtx.startIndex);
-      let cleaned = svgSection.replace(/```(?:svg)?\s*/i, '');
+      // 兼容清理 ```svg、```xml、``` xml、``` svg 等前缀
+      let cleaned = svgSection.replace(/```\s*(?:svg|xml)?\s*/i, '');
       cleaned = cleaned.replace(/```$/, '');
       const closingIndex = cleaned.indexOf('</svg>');
       if (closingIndex !== -1) {
diff --git a/js/modules/product-canvas.js b/js/modules/product-canvas.js
index f0ec6f3..7e690ff 100644
--- a/js/modules/product-canvas.js
+++ b/js/modules/product-canvas.js
@@ -22,7 +22,7 @@
     artifact: {
       type: 'svg',
       fence: 'svg',
-      startPattern: /```(?:svg)?\s*<svg/i,
+      startPattern: /```\s*(?:svg|xml)?\s*<svg/i,
       parser: parseResponse
     },
     hooks: {
diff --git a/js/modules/swot.js b/js/modules/swot.js
index 13610bb..852c285 100644
--- a/js/modules/swot.js
+++ b/js/modules/swot.js
@@ -22,7 +22,7 @@
     artifact: {
       type: 'svg',
       fence: 'svg',
-      startPattern: /```(?:svg)?\s*<svg/i,
+      startPattern: /```\s*(?:svg|xml)?\s*<svg/i,
       parser: parseResponse
     },
     hooks: {},
diff --git a/js/modules/thinksvg.js b/js/modules/thinksvg.js
index a6fe297..050359c 100644
--- a/js/modules/thinksvg.js
+++ b/js/modules/thinksvg.js
@@ -64,8 +64,8 @@
       // 代码围栏标识
       fence: 'svg',
 
-      // SVG 开始模式匹配
-      startPattern: /```(?:svg)?\s*<svg/i,
+      // SVG 开始模式匹配（兼容 ```svg、```xml、``` xml 等格式）
+      startPattern: /```\s*(?:svg|xml)?\s*<svg/i,
 
       // 内容解析器
       parser: parseResponse
diff --git a/js/utils.js b/js/utils.js
index 64d28ad..92b6674 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -24,7 +24,8 @@ function generateId(prefix = 'id') {
 // 解析SVG响应，提取SVG内容和前后文本，容错缺失的结束反引号
 function parseSVGResponse(response = '') {
   const content = typeof response === 'string' ? response : String(response || '');
-  const svgFenceRegex = /```(?:svg)?\s*([\s\S]*?)```/i;
+  // 兼容 ```svg、```xml、``` xml、``` svg 等格式
+  const svgFenceRegex = /```\s*(?:svg|xml)?\s*([\s\S]*?)```/i;
   const fenceMatch = content.match(svgFenceRegex);
 
   if (fenceMatch) {
@@ -40,14 +41,14 @@ function parseSVGResponse(response = '') {
     };
   }
 
-  // 兼容缺失结束反引号的情况
-  const svgStartRegex = /```(?:svg)?\s*<svg[\s\S]*$/i;
+  // 兼容缺失结束反引号的情况（同样兼容 xml 格式）
+  const svgStartRegex = /```\s*(?:svg|xml)?\s*<svg[\s\S]*$/i;
   const startMatch = content.match(svgStartRegex);
 
   if (startMatch) {
     const startIndex = startMatch.index;
     const beforeText = content.substring(0, startIndex).trim();
-    let svgSection = content.substring(startIndex).replace(/```(?:svg)?\s*/i, '').trim();
+    let svgSection = content.substring(startIndex).replace(/```\s*(?:svg|xml)?\s*/i, '').trim();
 
     // 去掉尾部残留的反引号
     svgSection = svgSection.replace(/```$/, '').trim();