@lobehub/chat 1.51.2 → 1.51.3

package/src/config/modelProviders/wenxin.ts

@@ -9,7 +9,8 @@ const BaiduWenxin: ModelProviderCard = {
         '百度自研的旗舰级大规模⼤语⾔模型，覆盖海量中英文语料，具有强大的通用能力，可满足绝大部分对话问答、创作生成、插件应用场景要求；支持自动对接百度搜索插件，保障问答信息时效。',
       displayName: 'ERNIE 3.5 8K',
       enabled: true,
-      id: 'ERNIE-3.5-8K',
+      functionCall: true,
+      id: 'ernie-3.5-8k',
       pricing: {
         currency: 'CNY',
         input: 0.8,
@@ -21,7 +22,8 @@ const BaiduWenxin: ModelProviderCard = {
       description:
         '百度自研的旗舰级大规模⼤语⾔模型，覆盖海量中英文语料，具有强大的通用能力，可满足绝大部分对话问答、创作生成、插件应用场景要求；支持自动对接百度搜索插件，保障问答信息时效。',
       displayName: 'ERNIE 3.5 8K Preview',
-      id: 'ERNIE-3.5-8K-Preview',
+      functionCall: true,
+      id: 'ernie-3.5-8k-preview',
       pricing: {
         currency: 'CNY',
         input: 0.8,
@@ -34,7 +36,8 @@ const BaiduWenxin: ModelProviderCard = {
         '百度自研的旗舰级大规模⼤语⾔模型，覆盖海量中英文语料，具有强大的通用能力，可满足绝大部分对话问答、创作生成、插件应用场景要求；支持自动对接百度搜索插件，保障问答信息时效。',
       displayName: 'ERNIE 3.5 128K',
       enabled: true,
-      id: 'ERNIE-3.5-128K',
+      functionCall: true,
+      id: 'ernie-3.5-128k',
       pricing: {
         currency: 'CNY',
         input: 0.8,
@@ -47,7 +50,8 @@ const BaiduWenxin: ModelProviderCard = {
         '百度自研的旗舰级超大规模⼤语⾔模型，相较ERNIE 3.5实现了模型能力全面升级，广泛适用于各领域复杂任务场景；支持自动对接百度搜索插件，保障问答信息时效。',
       displayName: 'ERNIE 4.0 8K',
       enabled: true,
-      id: 'ERNIE-4.0-8K-Latest',
+      functionCall: true,
+      id: 'ernie-4.0-8k-latest',
       pricing: {
         currency: 'CNY',
         input: 30,
@@ -59,7 +63,8 @@ const BaiduWenxin: ModelProviderCard = {
       description:
         '百度自研的旗舰级超大规模⼤语⾔模型，相较ERNIE 3.5实现了模型能力全面升级，广泛适用于各领域复杂任务场景；支持自动对接百度搜索插件，保障问答信息时效。',
       displayName: 'ERNIE 4.0 8K Preview',
-      id: 'ERNIE-4.0-8K-Preview',
+      functionCall: true,
+      id: 'ernie-4.0-8k-preview',
       pricing: {
         currency: 'CNY',
         input: 30,
@@ -72,7 +77,8 @@ const BaiduWenxin: ModelProviderCard = {
         '百度自研的旗舰级超大规模⼤语⾔模型，综合效果表现出色，广泛适用于各领域复杂任务场景；支持自动对接百度搜索插件，保障问答信息时效。相较于ERNIE 4.0在性能表现上更优秀',
       displayName: 'ERNIE 4.0 Turbo 8K',
       enabled: true,
-      id: 'ERNIE-4.0-Turbo-8K-Latest',
+      functionCall: true,
+      id: 'ernie-4.0-turbo-8k-latest',
       pricing: {
         currency: 'CNY',
         input: 20,
@@ -85,7 +91,8 @@ const BaiduWenxin: ModelProviderCard = {
         '百度自研的旗舰级超大规模⼤语⾔模型，综合效果表现出色，广泛适用于各领域复杂任务场景；支持自动对接百度搜索插件，保障问答信息时效。相较于ERNIE 4.0在性能表现上更优秀',
       displayName: 'ERNIE 4.0 Turbo 128K',
       enabled: true,
-      id: 'ERNIE-4.0-Turbo-128K',
+      functionCall: true,
+      id: 'ernie-4.0-turbo-128k',
       pricing: {
         currency: 'CNY',
         input: 20,
@@ -97,20 +104,33 @@ const BaiduWenxin: ModelProviderCard = {
       description:
         '百度自研的旗舰级超大规模⼤语⾔模型，综合效果表现出色，广泛适用于各领域复杂任务场景；支持自动对接百度搜索插件，保障问答信息时效。相较于ERNIE 4.0在性能表现上更优秀',
       displayName: 'ERNIE 4.0 Turbo 8K Preview',
-      id: 'ERNIE-4.0-Turbo-8K-Preview',
+      functionCall: true,
+      id: 'ernie-4.0-turbo-8k-preview',
       pricing: {
         currency: 'CNY',
         input: 20,
         output: 60,
       },
     },
+    {
+      contextWindowTokens: 8192,
+      description:
+        'ERNIE Lite是百度自研的轻量级大语言模型，兼顾优异的模型效果与推理性能，适合低算力AI加速卡推理使用。',
+      displayName: 'ERNIE Lite 8K',
+      id: 'ernie-lite-8k',
+      pricing: {
+        currency: 'CNY',
+        input: 0,
+        output: 0,
+      },
+    },
     {
       contextWindowTokens: 128_000,
       description:
         '百度自研的轻量级大语言模型，兼顾优异的模型效果与推理性能，效果比ERNIE Lite更优，适合低算力AI加速卡推理使用。',
       displayName: 'ERNIE Lite Pro 128K',
-      enabled: true,
-      id: 'ERNIE-Lite-Pro-128K',
+      functionCall: true,
+      id: 'ernie-lite-pro-128k',
       pricing: {
         currency: 'CNY',
         input: 0.2,
@@ -118,16 +138,15 @@ const BaiduWenxin: ModelProviderCard = {
       },
     },
     {
-      contextWindowTokens: 128_000,
+      contextWindowTokens: 8192,
       description:
-        '百度2024年最新发布的自研高性能大语言模型，通用能力优异，效果比ERNIE Speed更优，适合作为基座模型进行精调，更好地处理特定场景问题，同时具备极佳的推理性能。',
-      displayName: 'ERNIE Speed Pro 128K',
-      enabled: true,
-      id: 'ERNIE-Speed-Pro-128K',
+        'ERNIE Tiny是百度自研的超高性能大语言模型，部署与精调成本在文心系列模型中最低。',
+      displayName: 'ERNIE Tiny 8K',
+      id: 'ernie-tiny-8k',
       pricing: {
         currency: 'CNY',
-        input: 0.3,
-        output: 0.6,
+        input: 0,
+        output: 0,
       },
     },
     {
@@ -135,36 +154,94 @@ const BaiduWenxin: ModelProviderCard = {
       description:
         '百度2024年最新发布的自研高性能大语言模型，通用能力优异，适合作为基座模型进行精调，更好地处理特定场景问题，同时具备极佳的推理性能。',
       displayName: 'ERNIE Speed 128K',
-      id: 'ERNIE-Speed-128K',
+      id: 'ernie-speed-128k',
       pricing: {
         currency: 'CNY',
         input: 0,
         output: 0,
       },
     },
+    {
+      contextWindowTokens: 128_000,
+      description:
+        '百度2024年最新发布的自研高性能大语言模型，通用能力优异，效果比ERNIE Speed更优，适合作为基座模型进行精调，更好地处理特定场景问题，同时具备极佳的推理性能。',
+      displayName: 'ERNIE Speed Pro 128K',
+      id: 'ernie-speed-pro-128k',
+      pricing: {
+        currency: 'CNY',
+        input: 0.3,
+        output: 0.6,
+      },
+    },
     {
       contextWindowTokens: 8192,
       description:
         '百度自研的垂直场景大语言模型，适合游戏NPC、客服对话、对话角色扮演等应用场景，人设风格更为鲜明、一致，指令遵循能力更强，推理性能更优。',
       displayName: 'ERNIE Character 8K',
-      id: 'ERNIE-Character-8K',
+      id: 'ernie-char-8k',
       pricing: {
         currency: 'CNY',
         input: 4,
         output: 8,
       },
     },
+    {
+      contextWindowTokens: 8192,
+      description:
+        '百度自研的垂直场景大语言模型，适合游戏NPC、客服对话、对话角色扮演等应用场景，人设风格更为鲜明、一致，指令遵循能力更强，推理性能更优。',
+      displayName: 'ERNIE Character Fiction 8K',
+      id: 'ernie-char-fiction-8k',
+      pricing: {
+        currency: 'CNY',
+        input: 4,
+        output: 8,
+      },
+    },
+    {
+      contextWindowTokens: 8192,
+      description:
+        '百度自研通用大语言模型，在小说续写能力上有明显优势，也可用在短剧、电影等场景。',
+      displayName: 'ERNIE Novel 8K',
+      id: 'ernie-novel-8k',
+      pricing: {
+        currency: 'CNY',
+        input: 40,
+        output: 120,
+      },
+    },
+    {
+      contextWindowTokens: 65_536,
+      description:
+        'DeepSeek-V3 为杭州深度求索人工智能基础技术研究有限公司自研的 MoE 模型，其多项评测成绩突出，在主流榜单中位列开源模型榜首。V3 相比 V2.5 模型生成速度实现 3 倍提升，为用户带来更加迅速流畅的使用体验。',
+      displayName: 'DeepSeek V3',
+      id: 'deepseek-v3',
+      pricing: {
+        currency: 'CNY',
+        input: 0.8,
+        output: 1.6,
+      },
+    },
+    {
+      contextWindowTokens: 65_536,
+      description:
+        'DeepSeek-R1 在后训练阶段大规模使用了强化学习技术，在仅有极少标注数据的情况下，极大提升了模型推理能力。在数学、代码、自然语言推理等任务上，性能比肩 OpenAI o1 正式版。',
+      displayName: 'DeepSeek R1',
+      id: 'deepseek-r1',
+      pricing: {
+        currency: 'CNY',
+        input: 2,
+        output: 8,
+      },
+    },
   ],
-  checkModel: 'ERNIE-Speed-128K',
+  checkModel: 'ernie-speed-128k',
   description:
     '企业级一站式大模型与AI原生应用开发及服务平台，提供最全面易用的生成式人工智能模型开发、应用开发全流程工具链',
-  disableBrowserRequest: true,
   id: 'wenxin',
   modelsUrl: 'https://cloud.baidu.com/doc/WENXINWORKSHOP/s/Nlks5zkzu#%E5%AF%B9%E8%AF%9Dchat',
   name: 'Wenxin',
   settings: {
-    disableBrowserRequest: true,
-    sdkType: 'wenxin',
+    sdkType: 'openai',
     smoothing: {
       speed: 2,
       text: true,

package/src/const/auth.ts

@@ -39,9 +39,6 @@ export interface JWTPayload {
 
   cloudflareBaseURLOrAccountID?: string;
 
-  wenxinAccessKey?: string;
-  wenxinSecretKey?: string;
-
   /**
    * user id
    * in client db mode it's a uuid

package/src/features/Conversation/Error/APIKeyForm/index.tsx

@@ -10,7 +10,6 @@ import { GlobalLLMProviderKey } from '@/types/user/settings';
 
 import BedrockForm from './Bedrock';
 import ProviderApiKeyForm from './ProviderApiKeyForm';
-import WenxinForm from './Wenxin';
 
 interface APIKeyFormProps {
   id: string;
@@ -66,8 +65,6 @@ const APIKeyForm = memo<APIKeyFormProps>(({ id, provider }) => {
     <Center gap={16} style={{ maxWidth: 300 }}>
       {provider === ModelProvider.Bedrock ? (
         <BedrockForm />
-      ) : provider === ModelProvider.Wenxin ? (
-        <WenxinForm />
       ) : (
         <ProviderApiKeyForm
           apiKeyPlaceholder={apiKeyPlaceholder}

package/src/features/Conversation/components/ChatItem/utils.test.ts

@@ -147,4 +147,288 @@ describe('processWithArtifact', () => {
 
     expect(output).toEqual(`<lobeThinking>这个词汇涉及了`);
   });
+
+  it('should handle no empty line between lobeThinking and lobeArtifact', () => {
+    const input = `<lobeThinking>这是一个思考过程。</lobeThinking>
+<lobeArtifact identifier="test" type="image/svg+xml" title="测试">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+  <rect width="100" height="100" fill="blue"/>
+</svg>
+</lobeArtifact>`;
+
+    const output = processWithArtifact(input);
+
+    expect(output).toEqual(`<lobeThinking>这是一个思考过程。</lobeThinking>
+
+<lobeArtifact identifier="test" type="image/svg+xml" title="测试"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">  <rect width="100" height="100" fill="blue"/></svg></lobeArtifact>`);
+  });
+
+  it('should remove fenced code block between lobeArtifact and HTML content', () => {
+    const input = `<lobeArtifact identifier="web-calculator" type="text/html" title="简单的 Web 计算器">
+\`\`\`html
+<!DOCTYPE html>
+<html lang="zh">
+<head>
+  <title>计算器</title>
+</head>
+<body>
+  <div>计算器</div>
+</body>
+</html>
+\`\`\`
+</lobeArtifact>`;
+
+    const output = processWithArtifact(input);
+
+    expect(output).toEqual(
+      `<lobeArtifact identifier="web-calculator" type="text/html" title="简单的 Web 计算器"><!DOCTYPE html><html lang="zh"><head>  <title>计算器</title></head><body>  <div>计算器</div></body></html></lobeArtifact>`,
+    );
+  });
+
+  it('should remove fenced code block between lobeArtifact and HTML content without doctype', () => {
+    const input = `<lobeArtifact identifier="web-calculator" type="text/html" title="简单的 Web 计算器">
+\`\`\`html
+<html lang="zh">
+<head>
+  <title>计算器</title>
+</head>
+<body>
+  <div>计算器</div>
+</body>
+</html>
+\`\`\`
+</lobeArtifact>`;
+
+    const output = processWithArtifact(input);
+
+    expect(output).toEqual(
+      `<lobeArtifact identifier="web-calculator" type="text/html" title="简单的 Web 计算器"><html lang="zh"><head>  <title>计算器</title></head><body>  <div>计算器</div></body></html></lobeArtifact>`,
+    );
+  });
+
+  it('should remove outer fenced code block wrapping lobeThinking and lobeArtifact', () => {
+    const input =
+      '```tool_code\n<lobeThinking>这是一个思考过程。</lobeThinking>\n\n<lobeArtifact identifier="test" type="text/html" title="测试">\n<div>测试内容</div>\n</lobeArtifact>\n```';
+
+    const output = processWithArtifact(input);
+
+    expect(output).toEqual(
+      '<lobeThinking>这是一个思考过程。</lobeThinking>\n\n<lobeArtifact identifier="test" type="text/html" title="测试"><div>测试内容</div></lobeArtifact>',
+    );
+  });
+
+  it('should handle both outer code block and inner HTML code block', () => {
+    const input =
+      '```tool_code\n<lobeThinking>这是一个思考过程。</lobeThinking>\n\n<lobeArtifact identifier="test" type="text/html" title="测试">\n```html\n<!DOCTYPE html>\n<html>\n<body>\n<div>测试内容</div>\n</body>\n</html>\n```\n</lobeArtifact>\n```';
+
+    const output = processWithArtifact(input);
+
+    expect(output).toEqual(
+      '<lobeThinking>这是一个思考过程。</lobeThinking>\n\n<lobeArtifact identifier="test" type="text/html" title="测试"><!DOCTYPE html><html><body><div>测试内容</div></body></html></lobeArtifact>',
+    );
+  });
+
+  it('should handle complete conversation with text and tags', () => {
+    const input = `Sure, I can help you with that! Here is a basic calculator built using HTML, CSS, and JavaScript.
+
+<lobeThinking>A web calculator is a substantial piece of code and a good candidate for an artifact. It's self-contained, and it's likely that the user will want to modify it. This is a new request, so I will create a new artifact.</lobeThinking>
+
+<lobeArtifact identifier="web-calculator" type="text/html" title="Web Calculator">
+\`\`\`html
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Simple Calculator</title>
+</head>
+<body>
+    <div>Calculator</div>
+</body>
+</html>
+\`\`\`
+</lobeArtifact>
+
+This code provides a basic calculator that can perform addition, subtraction, multiplication, and division.`;
+
+    const output = processWithArtifact(input);
+
+    expect(output)
+      .toEqual(`Sure, I can help you with that! Here is a basic calculator built using HTML, CSS, and JavaScript.
+
+<lobeThinking>A web calculator is a substantial piece of code and a good candidate for an artifact. It's self-contained, and it's likely that the user will want to modify it. This is a new request, so I will create a new artifact.</lobeThinking>
+
+<lobeArtifact identifier="web-calculator" type="text/html" title="Web Calculator"><!DOCTYPE html><html lang="en"><head>    <meta charset="UTF-8">    <title>Simple Calculator</title></head><body>    <div>Calculator</div></body></html></lobeArtifact>
+
+This code provides a basic calculator that can perform addition, subtraction, multiplication, and division.`);
+  });
+});
+
+describe('outer code block removal', () => {
+  it('should remove outer html code block', () => {
+    const input = `\`\`\`html
+<lobeThinking>Test thinking</lobeThinking>
+<lobeArtifact identifier="test" type="text/html" title="Test">
+<!DOCTYPE html>
+<html>
+<body>Test</body>
+</html>
+</lobeArtifact>
+\`\`\``;
+
+    const output = processWithArtifact(input);
+
+    expect(output).toEqual(`<lobeThinking>Test thinking</lobeThinking>
+
+<lobeArtifact identifier="test" type="text/html" title="Test"><!DOCTYPE html><html><body>Test</body></html></lobeArtifact>`);
+  });
+
+  it('should remove outer tool_code code block', () => {
+    const input = `\`\`\`tool_code
+<lobeThinking>Test thinking</lobeThinking>
+<lobeArtifact identifier="test" type="text/html" title="Test">
+<!DOCTYPE html>
+<html>
+<body>Test</body>
+</html>
+</lobeArtifact>
+\`\`\``;
+
+    const output = processWithArtifact(input);
+
+    expect(output).toEqual(`<lobeThinking>Test thinking</lobeThinking>
+
+<lobeArtifact identifier="test" type="text/html" title="Test"><!DOCTYPE html><html><body>Test</body></html></lobeArtifact>`);
+  });
+
+  it('should handle input without outer code block', () => {
+    const input = `<lobeThinking>Test thinking</lobeThinking>
+<lobeArtifact identifier="test" type="text/html" title="Test">
+<!DOCTYPE html>
+<html>
+<body>Test</body>
+</html>
+</lobeArtifact>`;
+
+    const output = processWithArtifact(input);
+
+    expect(output).toEqual(`<lobeThinking>Test thinking</lobeThinking>
+
+<lobeArtifact identifier="test" type="text/html" title="Test"><!DOCTYPE html><html><body>Test</body></html></lobeArtifact>`);
+  });
+
+  it('should handle code block with content before and after', () => {
+    const input = `Some text before
+
+\`\`\`html
+<lobeThinking>Test thinking</lobeThinking>
+
+<lobeArtifact identifier="test" type="text/html" title="Test">
+<!DOCTYPE html>
+<html>
+<body>Test</body>
+</html>
+</lobeArtifact>
+\`\`\`
+
+Some text after`;
+
+    const output = processWithArtifact(input);
+
+    expect(output).toEqual(`Some text before
+
+<lobeThinking>Test thinking</lobeThinking>
+
+<lobeArtifact identifier="test" type="text/html" title="Test"><!DOCTYPE html><html><body>Test</body></html></lobeArtifact>
+
+Some text after`);
+  });
+
+  it('should handle code block with only lobeArtifact tag', () => {
+    const input = `\`\`\`html
+<lobeArtifact identifier="test" type="text/html" title="Test">
+<!DOCTYPE html>
+<html>
+<body>Test</body>
+</html>
+</lobeArtifact>
+\`\`\``;
+
+    const output = processWithArtifact(input);
+
+    expect(output).toEqual(
+      `<lobeArtifact identifier="test" type="text/html" title="Test"><!DOCTYPE html><html><body>Test</body></html></lobeArtifact>`,
+    );
+  });
+
+  it('should handle code block with surrounding text and both lobeThinking and lobeArtifact', () => {
+    const input = `---
+
+\`\`\`tool_code
+<lobeThinking>The user reported a \`SyntaxError\` in the browser console, indicating a problem with the JavaScript code in the calculator artifact. The error message "Identifier 'display' has already been declared" suggests a variable naming conflict. I need to review the JavaScript code and correct the issue. This is an update to the existing "calculator-web-artifact" artifact.</lobeThinking>
+<lobeArtifact identifier="calculator-web-artifact" type="text/html" title="Simple Calculator">
+<!DOCTYPE html>
+<html lang="en">
+...
+</html>
+</lobeArtifact>
+\`\`\`
+I've updated the calculator artifact. The issue was a naming conflict with the \`display\` variable. I've renamed the input element's ID to \`calc-display\` and the JavaScript variable to \`displayElement\` to avoid the conflict. The calculator should now function correctly.
+
+---`;
+
+    const output = processWithArtifact(input);
+
+    expect(output).toEqual(`---
+
+<lobeThinking>The user reported a \`SyntaxError\` in the browser console, indicating a problem with the JavaScript code in the calculator artifact. The error message "Identifier 'display' has already been declared" suggests a variable naming conflict. I need to review the JavaScript code and correct the issue. This is an update to the existing "calculator-web-artifact" artifact.</lobeThinking>
+
+<lobeArtifact identifier="calculator-web-artifact" type="text/html" title="Simple Calculator"><!DOCTYPE html><html lang="en">...</html></lobeArtifact>
+
+I've updated the calculator artifact. The issue was a naming conflict with the \`display\` variable. I've renamed the input element's ID to \`calc-display\` and the JavaScript variable to \`displayElement\` to avoid the conflict. The calculator should now function correctly.
+
+---`);
+  });
+
+  it('should handle code block before lobeThinking and lobeArtifact', () => {
+    const input = `
+Okay, I'll create a temperature converter with the logic wrapped in an IIFE and event listeners attached in Javascript.
+
+\`\`\`html
+<!DOCTYPE html>
+<html lang="en">
+...
+</html>
+\`\`\`
+
+<lobeThinking>This is a good candidate for an artifact. It's a self-contained HTML document with embedded JavaScript that provides a functional temperature converter. It's more than a simple code snippet and can be reused or modified. This is a new request, so I'll create a new artifact with the identifier "temperature-converter".</lobeThinking>
+
+<lobeArtifact identifier="temperature-converter" type="text/html" title="Temperature Converter">
+\`\`\`html
+<!DOCTYPE html>
+<html lang="en">
+...
+</html>
+\`\`\`
+</lobeArtifact>
+This HTML document includes the temperature converter with the requested features: the logic is wrapped in an IIFE, and event listeners are attached in JavaScript.
+`;
+
+    const output = processWithArtifact(input);
+
+    expect(output)
+      .toEqual(`Okay, I'll create a temperature converter with the logic wrapped in an IIFE and event listeners attached in Javascript.
+
+\`\`\`html
+<!DOCTYPE html>
+<html lang="en">
+...
+</html>
+\`\`\`
+
+<lobeThinking>This is a good candidate for an artifact. It's a self-contained HTML document with embedded JavaScript that provides a functional temperature converter. It's more than a simple code snippet and can be reused or modified. This is a new request, so I'll create a new artifact with the identifier "temperature-converter".</lobeThinking>
+
+<lobeArtifact identifier="temperature-converter" type="text/html" title="Temperature Converter"><!DOCTYPE html><html lang="en">...</html></lobeArtifact>
+
+This HTML document includes the temperature converter with the requested features: the logic is wrapped in an IIFE, and event listeners are attached in JavaScript.`);
+  });
 });

package/src/features/Conversation/components/ChatItem/utils.ts

@@ -4,24 +4,55 @@ import { ARTIFACT_TAG_REGEX, ARTIFACT_THINKING_TAG_REGEX } from '@/const/plugin'
  * Replace all line breaks in the matched `lobeArtifact` tag with an empty string
  */
 export const processWithArtifact = (input: string = '') => {
-  let output = input;
-  const thinkMatch = ARTIFACT_THINKING_TAG_REGEX.exec(input);
+  // First remove outer fenced code block if it exists
+  let output = input.replace(
+    /^([\S\s]*?)\s*```[^\n]*\n((?:<lobeThinking>[\S\s]*?<\/lobeThinking>\s*\n\s*)?<lobeArtifact[\S\s]*?<\/lobeArtifact>\s*)\n```\s*([\S\s]*?)$/,
+    (_, before = '', content, after = '') => {
+      return [before.trim(), content.trim(), after.trim()].filter(Boolean).join('\n\n');
+    },
+  );
+
+  const thinkMatch = ARTIFACT_THINKING_TAG_REGEX.exec(output);
 
   // If the input contains the `lobeThinking` tag, replace all line breaks with an empty string
-  if (thinkMatch)
-    output = input.replace(ARTIFACT_THINKING_TAG_REGEX, (match) =>
+  if (thinkMatch) {
+    output = output.replace(ARTIFACT_THINKING_TAG_REGEX, (match) =>
       match.replaceAll(/\r?\n|\r/g, ''),
     );
+  }
 
-  const match = ARTIFACT_TAG_REGEX.exec(input);
+  // Add empty line between lobeThinking and lobeArtifact if they are adjacent
+  output = output.replace(/(<\/lobeThinking>)\r?\n(<lobeArtifact)/, '$1\n\n$2');
+
+  // Remove fenced code block between lobeArtifact and HTML content
+  output = output.replace(
+    /(<lobeArtifact[^>]*>)\s*```[^\n]*\n([\S\s]*?)(```\n)?(<\/lobeArtifact>)/,
+    (_, start, content, __, end) => {
+      if (content.trim().startsWith('<!DOCTYPE html') || content.trim().startsWith('<html')) {
+        return start + content.trim() + end;
+      }
+      return start + content + (__ || '') + end;
+    },
+  );
+
+  // Keep existing code blocks that are not part of lobeArtifact
+  output = output.replace(
+    /^([\S\s]*?)(<lobeThinking>[\S\s]*?<\/lobeThinking>\s*\n\s*<lobeArtifact[\S\s]*?<\/lobeArtifact>)([\S\s]*?)$/,
+    (_, before, content, after) => {
+      return [before.trim(), content.trim(), after.trim()].filter(Boolean).join('\n\n');
+    },
+  );
+
+  const match = ARTIFACT_TAG_REGEX.exec(output);
   // If the input contains the `lobeArtifact` tag, replace all line breaks with an empty string
-  if (match)
-    return output.replace(ARTIFACT_TAG_REGEX, (match) => match.replaceAll(/\r?\n|\r/g, ''));
+  if (match) {
+    output = output.replace(ARTIFACT_TAG_REGEX, (match) => match.replaceAll(/\r?\n|\r/g, ''));
+  }
 
   // if not match, check if it's start with <lobeArtifact but not closed
   const regex = /<lobeArtifact\b(?:(?!\/?>)[\S\s])*$/;
   if (regex.test(output)) {
-    return output.replace(regex, '<lobeArtifact>');
+    output = output.replace(regex, '<lobeArtifact>');
   }
 
   return output;