diff --git a/src/renderer/src/components/markdown/MarkdownRenderer.vue b/src/renderer/src/components/markdown/MarkdownRenderer.vue
index 32e8a433ae..0612110266 100644
--- a/src/renderer/src/components/markdown/MarkdownRenderer.vue
+++ b/src/renderer/src/components/markdown/MarkdownRenderer.vue
@@ -28,18 +28,22 @@ import { useUiSettingsStore } from '@/stores/uiSettingsStore'
 const props = defineProps<{
   content: string
   debug?: boolean
+  messageId?: string
+  threadId?: string
 }>()
 const themeStore = useThemeStore()
 const uiSettingsStore = useUiSettingsStore()
 // 组件映射表
 const artifactStore = useArtifactStore()
 // 生成唯一的 message ID 和 thread ID，用于 MarkdownRenderer
-const messageId = `artifact-msg-${nanoid()}`
-const threadId = `artifact-thread-${nanoid()}`
+const fallbackMessageId = `artifact-msg-${nanoid()}`
+const fallbackThreadId = `artifact-thread-${nanoid()}`
 const referenceStore = useReferenceStore()
 const newAgentPresenter = usePresenter('newAgentPresenter')
 const referenceNode = ref<HTMLElement | null>(null)
 const debouncedContent = ref(props.content)
+const effectiveMessageId = computed(() => props.messageId ?? fallbackMessageId)
+const effectiveThreadId = computed(() => props.threadId ?? fallbackThreadId)
 const codeBlockMonacoOption = computed(() => ({
   fontFamily: uiSettingsStore.formattedCodeFontFamily
 }))
@@ -63,11 +67,11 @@ setCustomComponents({
   reference: (_props) =>
     h(ReferenceNode, {
       ..._props,
-      messageId,
-      threadId,
+      messageId: effectiveMessageId.value,
+      threadId: effectiveThreadId.value,
       onClick() {
         // TODO: remove this temporary fallback after search result loading is fully unified.
-        newAgentPresenter.getSearchResults(_props.messageId ?? '').then((results) => {
+        newAgentPresenter.getSearchResults(effectiveMessageId.value).then((results) => {
           const index = parseInt(_props.node.id)
           if (index < results.length) {
             window.open(results[index - 1].url, '_blank', 'noopener,noreferrer')
@@ -77,7 +81,7 @@ setCustomComponents({
       onMouseEnter() {
         console.log('Mouse entered')
         referenceStore.hideReference()
-        newAgentPresenter.getSearchResults(_props.messageId ?? '').then((results) => {
+        newAgentPresenter.getSearchResults(effectiveMessageId.value).then((results) => {
           const index = parseInt(_props.node.id)
           if (index - 1 < results.length && referenceNode.value) {
             referenceStore.showReference(
@@ -120,8 +124,8 @@ setCustomComponents({
             content: v.node.code,
             status: 'loaded'
           },
-          messageId,
-          threadId,
+          effectiveMessageId.value,
+          effectiveThreadId.value,
           { force: true }
         )
       }
diff --git a/src/renderer/src/components/message/MessageBlockContent.vue b/src/renderer/src/components/message/MessageBlockContent.vue
index fa33e73cee..13674b5d58 100644
--- a/src/renderer/src/components/message/MessageBlockContent.vue
+++ b/src/renderer/src/components/message/MessageBlockContent.vue
@@ -2,7 +2,13 @@
 <template>
   <template v-for="(part, index) in processedContent" :key="index">
     <!-- 使用结构化渲染器替代 v-html -->
-    <MarkdownRenderer v-if="part.type === 'text'" :content="part.content" :loading="part.loading" />
+    <MarkdownRenderer
+      v-if="part.type === 'text'"
+      :content="part.content"
+      :loading="part.loading"
+      :message-id="messageId"
+      :thread-id="threadId"
+    />
 
     <ArtifactThinking v-else-if="part.type === 'thinking' && part.loading" />
     <div v-else-if="part.type === 'artifact' && part.artifact" class="my-1">
diff --git a/src/renderer/src/components/sidepanel/WorkspacePanel.vue b/src/renderer/src/components/sidepanel/WorkspacePanel.vue
index de1569ff5f..eb9895aeb9 100644
--- a/src/renderer/src/components/sidepanel/WorkspacePanel.vue
+++ b/src/renderer/src/components/sidepanel/WorkspacePanel.vue
@@ -262,14 +262,19 @@ watch(
       return
     }
 
-    const exists = items.some(
+    const existsInArtifactItems = items.some(
       (item) =>
         item.threadId === context.threadId &&
         item.messageId === context.messageId &&
         item.artifactId === context.artifactId
     )
 
-    if (!exists) {
+    const matchesCurrentArtifact =
+      artifactStore.currentArtifact?.id === context.artifactId &&
+      artifactStore.currentMessageId === context.messageId &&
+      artifactStore.currentThreadId === context.threadId
+
+    if (!existsInArtifactItems && !matchesCurrentArtifact) {
       sidepanelStore.clearArtifact(props.sessionId)
     }
   },
diff --git a/src/renderer/src/components/sidepanel/WorkspaceViewer.vue b/src/renderer/src/components/sidepanel/WorkspaceViewer.vue
index 11356ce688..f73351d3b6 100644
--- a/src/renderer/src/components/sidepanel/WorkspaceViewer.vue
+++ b/src/renderer/src/components/sidepanel/WorkspaceViewer.vue
@@ -102,6 +102,7 @@
 
       <WorkspacePreviewPane
         v-else-if="paneKind === 'preview' && previewKind"
+        :session-id="props.sessionId"
         :preview-kind="previewKind"
         :artifact="previewArtifact"
         :file-preview="previewFilePreview"
diff --git a/src/renderer/src/components/sidepanel/viewer/WorkspacePreviewPane.vue b/src/renderer/src/components/sidepanel/viewer/WorkspacePreviewPane.vue
index e424dde249..d1e4dc7290 100644
--- a/src/renderer/src/components/sidepanel/viewer/WorkspacePreviewPane.vue
+++ b/src/renderer/src/components/sidepanel/viewer/WorkspacePreviewPane.vue
@@ -5,7 +5,11 @@
     data-testid="workspace-preview-markdown"
   >
     <div class="min-h-full px-4 py-4">
-      <MarkdownRenderer :content="resolvedContent" />
+      <MarkdownRenderer
+        :content="resolvedContent"
+        :message-id="previewSourceId"
+        :thread-id="props.sessionId"
+      />
     </div>
   </div>
 
@@ -91,6 +95,7 @@ import MermaidArtifact from '@/components/artifacts/MermaidArtifact.vue'
 import ReactArtifact from '@/components/artifacts/ReactArtifact.vue'
 
 const props = defineProps<{
+  sessionId?: string
   previewKind: WorkspacePreviewKind
   artifact?: ArtifactState | null
   filePreview?: WorkspaceFilePreview | null
@@ -137,6 +142,7 @@ const fileBlock = computed(() => {
 
 const resolvedBlock = computed(() => artifactBlock.value ?? fileBlock.value)
 const resolvedContent = computed(() => props.artifact?.content ?? props.filePreview?.content ?? '')
+const previewSourceId = computed(() => props.artifact?.id ?? props.filePreview?.path)
 const resolvedTitle = computed(
   () => props.artifact?.title ?? props.filePreview?.name ?? t('artifacts.preview')
 )
diff --git a/test/renderer/components/MarkdownRenderer.test.ts b/test/renderer/components/MarkdownRenderer.test.ts
new file mode 100644
index 0000000000..973853afe1
--- /dev/null
+++ b/test/renderer/components/MarkdownRenderer.test.ts
@@ -0,0 +1,178 @@
+import { flushPromises, mount } from '@vue/test-utils'
+import { defineComponent, h } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const { showArtifactMock, getSearchResultsMock, hideReferenceMock, showReferenceMock, nanoidMock } =
+  vi.hoisted(() => ({
+    showArtifactMock: vi.fn(),
+    getSearchResultsMock: vi.fn().mockResolvedValue([]),
+    hideReferenceMock: vi.fn(),
+    showReferenceMock: vi.fn(),
+    nanoidMock: vi.fn()
+  }))
+
+const setup = async (props: Record<string, unknown> = {}) => {
+  vi.resetModules()
+
+  let customComponents: Record<string, (...args: any[]) => any> = {}
+
+  vi.doMock('nanoid', () => ({
+    nanoid: nanoidMock
+  }))
+
+  vi.doMock('@/stores/artifact', () => ({
+    useArtifactStore: () => ({
+      showArtifact: showArtifactMock
+    })
+  }))
+
+  vi.doMock('@/stores/reference', () => ({
+    useReferenceStore: () => ({
+      hideReference: hideReferenceMock,
+      showReference: showReferenceMock
+    })
+  }))
+
+  vi.doMock('@/stores/theme', () => ({
+    useThemeStore: () => ({
+      isDark: false
+    })
+  }))
+
+  vi.doMock('@/stores/uiSettingsStore', () => ({
+    useUiSettingsStore: () => ({
+      formattedCodeFontFamily: 'monospace'
+    })
+  }))
+
+  vi.doMock('@/composables/usePresenter', () => ({
+    usePresenter: () => ({
+      getSearchResults: getSearchResultsMock
+    })
+  }))
+
+  vi.doMock('markstream-vue', () => {
+    const previewPayload = {
+      id: 'preview-artifact',
+      artifactType: 'text/html',
+      artifactTitle: 'HTML Preview',
+      language: 'html',
+      node: {
+        code: '<h1>Hello</h1>'
+      }
+    }
+
+    const NodeRenderer = defineComponent({
+      name: 'NodeRenderer',
+      setup() {
+        return () =>
+          customComponents.code_block?.({
+            node: {
+              language: 'html',
+              code: '<h1>Hello</h1>',
+              raw: '<h1>Hello</h1>'
+            }
+          }) ?? h('div')
+      }
+    })
+
+    const CodeBlockNode = defineComponent({
+      name: 'CodeBlockNode',
+      emits: ['previewCode'],
+      mounted() {
+        this.$emit('previewCode', previewPayload)
+      },
+      render() {
+        return h('div', { 'data-testid': 'code-block-node' })
+      }
+    })
+
+    const ReferenceNode = defineComponent({
+      name: 'ReferenceNode',
+      render() {
+        return h('div')
+      }
+    })
+
+    const MermaidBlockNode = defineComponent({
+      name: 'MermaidBlockNode',
+      render() {
+        return h('div')
+      }
+    })
+
+    return {
+      default: NodeRenderer,
+      NodeRenderer,
+      CodeBlockNode,
+      ReferenceNode,
+      MermaidBlockNode,
+      setCustomComponents: (components: Record<string, (...args: any[]) => any>) => {
+        customComponents = components
+      }
+    }
+  })
+
+  const MarkdownRenderer = (await import('@/components/markdown/MarkdownRenderer.vue')).default
+  const wrapper = mount(MarkdownRenderer, {
+    props: {
+      content: '```html\n<h1>Hello</h1>\n```',
+      ...props
+    }
+  })
+
+  await flushPromises()
+
+  return { wrapper }
+}
+
+describe('MarkdownRenderer', () => {
+  beforeEach(() => {
+    showArtifactMock.mockReset()
+    getSearchResultsMock.mockReset()
+    getSearchResultsMock.mockResolvedValue([])
+    hideReferenceMock.mockReset()
+    showReferenceMock.mockReset()
+    nanoidMock.mockReset()
+    nanoidMock.mockReturnValueOnce('fallback-message').mockReturnValueOnce('fallback-thread')
+  })
+
+  it('uses the provided message and thread ids for HTML preview artifacts', async () => {
+    await setup({
+      messageId: 'message-1',
+      threadId: 'thread-1'
+    })
+
+    expect(showArtifactMock).toHaveBeenCalledWith(
+      {
+        id: 'preview-artifact',
+        type: 'text/html',
+        title: 'HTML Preview',
+        language: 'html',
+        content: '<h1>Hello</h1>',
+        status: 'loaded'
+      },
+      'message-1',
+      'thread-1',
+      { force: true }
+    )
+  })
+
+  it('falls back to local ids when no message or thread ids are provided', async () => {
+    await setup()
+
+    expect(showArtifactMock).toHaveBeenCalledWith(
+      {
+        id: 'preview-artifact',
+        type: 'text/html',
+        title: 'HTML Preview',
+        language: 'html',
+        content: '<h1>Hello</h1>',
+        status: 'loaded'
+      },
+      'artifact-msg-fallback-message',
+      'artifact-thread-fallback-thread',
+      { force: true }
+    )
+  })
+})
diff --git a/test/renderer/components/WorkspacePanel.test.ts b/test/renderer/components/WorkspacePanel.test.ts
index 4c750af71f..e0b5746449 100644
--- a/test/renderer/components/WorkspacePanel.test.ts
+++ b/test/renderer/components/WorkspacePanel.test.ts
@@ -212,6 +212,9 @@ describe('WorkspacePanel', () => {
     sessionState.sections.files = true
     sessionState.sections.git = true
     sessionState.sections.artifacts = true
+    artifactStore.currentArtifact = null
+    artifactStore.currentMessageId = null
+    artifactStore.currentThreadId = null
 
     showArtifactMock.mockReset()
     toggleSectionMock.mockReset()
@@ -484,4 +487,34 @@ describe('WorkspacePanel', () => {
 
     wrapper.unmount()
   })
+
+  it('keeps the current temporary artifact selection when it is not part of artifact items', async () => {
+    sessionState.selectedArtifactContext = {
+      threadId: 's1',
+      messageId: 'C:/repo/README.md',
+      artifactId: 'temp-html-preview'
+    }
+    artifactStore.currentArtifact = {
+      id: 'temp-html-preview',
+      type: 'text/html',
+      title: 'HTML Preview',
+      content: '<h1>Hello</h1>',
+      status: 'loaded'
+    }
+    artifactStore.currentMessageId = 'C:/repo/README.md'
+    artifactStore.currentThreadId = 's1'
+
+    const wrapper = mount(WorkspacePanel, {
+      props: {
+        sessionId: 's1',
+        workspacePath: 'C:/repo'
+      }
+    })
+
+    await flushPromises()
+
+    expect(clearArtifactMock).not.toHaveBeenCalled()
+
+    wrapper.unmount()
+  })
 })
diff --git a/test/renderer/components/WorkspacePreviewPane.test.ts b/test/renderer/components/WorkspacePreviewPane.test.ts
index b85e822c21..df294c1d9e 100644
--- a/test/renderer/components/WorkspacePreviewPane.test.ts
+++ b/test/renderer/components/WorkspacePreviewPane.test.ts
@@ -1,9 +1,15 @@
 import { mount } from '@vue/test-utils'
-import { describe, expect, it } from 'vitest'
+import { describe, expect, it, vi } from 'vitest'
 import { defineComponent } from 'vue'
 
 import WorkspacePreviewPane from '../../../src/renderer/src/components/sidepanel/viewer/WorkspacePreviewPane.vue'
 
+vi.mock('vue-i18n', () => ({
+  useI18n: () => ({
+    t: (key: string) => key
+  })
+}))
+
 const createFilePreview = (overrides: Record<string, unknown> = {}) => ({
   path: 'C:/repo/docs/index.html',
   relativePath: 'docs/index.html',
@@ -31,6 +37,7 @@ describe('WorkspacePreviewPane', () => {
   ])('renders %s file previews inside a single iframe pane', (kind, previewUrl, sandbox) => {
     const wrapper = mount(WorkspacePreviewPane, {
       props: {
+        sessionId: 'session-1',
         previewKind: kind,
         filePreview: createFilePreview({
           path: `C:/repo/docs/example.${kind}`,
@@ -82,6 +89,7 @@ describe('WorkspacePreviewPane', () => {
   it('keeps markdown preview in the markdown pane instead of iframe', () => {
     const wrapper = mount(WorkspacePreviewPane, {
       props: {
+        sessionId: 'session-1',
         previewKind: 'markdown',
         filePreview: createFilePreview({
           path: 'C:/repo/README.md',
@@ -101,9 +109,18 @@ describe('WorkspacePreviewPane', () => {
               content: {
                 type: String,
                 required: true
+              },
+              messageId: {
+                type: String,
+                default: undefined
+              },
+              threadId: {
+                type: String,
+                default: undefined
               }
             },
-            template: '<div data-testid="markdown-renderer">{{ content }}</div>'
+            template:
+              '<div data-testid="markdown-renderer" :data-message-id="messageId" :data-thread-id="threadId">{{ content }}</div>'
           }),
           HTMLArtifact: true,
           SvgArtifact: true,
@@ -116,11 +133,18 @@ describe('WorkspacePreviewPane', () => {
     expect(wrapper.find('iframe').exists()).toBe(false)
     expect(wrapper.get('[data-testid="workspace-preview-markdown"]').exists()).toBe(true)
     expect(wrapper.get('[data-testid="markdown-renderer"]').text()).toContain('# Hello')
+    expect(wrapper.get('[data-testid="markdown-renderer"]').attributes('data-message-id')).toBe(
+      'C:/repo/README.md'
+    )
+    expect(wrapper.get('[data-testid="markdown-renderer"]').attributes('data-thread-id')).toBe(
+      'session-1'
+    )
   })
 
   it('keeps image preview in the image pane instead of iframe', () => {
     const wrapper = mount(WorkspacePreviewPane, {
       props: {
+        sessionId: 'session-1',
         previewKind: 'image',
         filePreview: createFilePreview({
           path: 'C:/repo/assets/logo.png',
diff --git a/test/renderer/components/WorkspaceViewer.test.ts b/test/renderer/components/WorkspaceViewer.test.ts
index cccf67901e..4399d29a28 100644
--- a/test/renderer/components/WorkspaceViewer.test.ts
+++ b/test/renderer/components/WorkspaceViewer.test.ts
@@ -81,12 +81,17 @@ describe('WorkspaceViewer', () => {
       default: defineComponent({
         name: 'WorkspacePreviewPane',
         props: {
+          sessionId: {
+            type: String,
+            default: undefined
+          },
           previewKind: {
             type: String,
             required: true
           }
         },
-        template: '<div data-testid="preview-pane">{{ previewKind }}</div>'
+        template:
+          '<div data-testid="preview-pane" :data-session-id="sessionId">{{ previewKind }}</div>'
       })
     }))
 
@@ -209,6 +214,9 @@ describe('WorkspaceViewer', () => {
     })
 
     expect(wrapper.get('[data-testid="preview-pane"]').text()).toContain('markdown')
+    expect(wrapper.get('[data-testid="preview-pane"]').attributes('data-session-id')).toBe(
+      'thread-1'
+    )
 
     const codeButton = wrapper
       .findAll('button')
diff --git a/test/renderer/components/message/MessageBlockContent.test.ts b/test/renderer/components/message/MessageBlockContent.test.ts
index 8ffb908b9e..ab0257e9b8 100644
--- a/test/renderer/components/message/MessageBlockContent.test.ts
+++ b/test/renderer/components/message/MessageBlockContent.test.ts
@@ -57,9 +57,18 @@ vi.mock('@/components/markdown/MarkdownRenderer.vue', () => ({
       content: {
         type: String,
         default: ''
+      },
+      messageId: {
+        type: String,
+        default: undefined
+      },
+      threadId: {
+        type: String,
+        default: undefined
       }
     },
-    template: '<div class="markdown-stub">{{ content }}</div>'
+    template:
+      '<div class="markdown-stub" :data-message-id="messageId" :data-thread-id="threadId">{{ content }}</div>'
   })
 }))
 
@@ -141,4 +150,24 @@ describe('MessageBlockContent', () => {
       's2'
     )
   })
+
+  it('passes message and thread ids to MarkdownRenderer for text parts', async () => {
+    const wrapper = mount(MessageBlockContent, {
+      props: {
+        block: createBlock({
+          status: 'success',
+          content: 'plain markdown content'
+        }),
+        messageId: 'm3',
+        threadId: 's3'
+      }
+    })
+
+    await flushPromises()
+
+    const markdown = wrapper.get('.markdown-stub')
+    expect(markdown.attributes('data-message-id')).toBe('m3')
+    expect(markdown.attributes('data-thread-id')).toBe('s3')
+    expect(markdown.text()).toContain('plain markdown content')
+  })
 })