feat: preview Agent HTML in conversations and unblock long replies

Agent replies that produced HTML could only be read as source, so users had to copy the markup into an external file to see the result. Completed Agent and Subagent output now renders complete HTML documents, single-root HTML replies, and `html` / `htm` code blocks as an isolated static preview in place. Each preview keeps a persistent notice that scripts and network are disabled and offers the same icon actions as Mermaid diagrams: a source toggle and a full-screen preview. The new "render HTML in conversations" switch under Platform Features / General is on by default, applies to the open conversation immediately, and falls back to HTML source when disabled. Previews cannot run scripts, reach the network, submit forms, open windows, or load remote media; author stylesheets and inline styles are preserved so the intended layout survives, and remote resource loading is refused by the preview CSP instead. Direct-model replies no longer fail once they grow large. The byte caps on streaming responses, single stream blocks, non-streaming replies, model tool arguments, tool request context, aggregate tool results, and accumulated answer text are removed, so users stop seeing "模型接口流式响应超过安全限制" on long answers. Response length is now governed by the request timeout, cancellation, and context compression. Image generation responses keep their decodable-image validation. A message sent after a failed or interrupted run stayed in the pending queue instead of running. The conversation is now released whenever a run reaches any terminal state, not only when the renderer reports readiness again, and a dispatched queue item whose run never starts releases its reservation and returns to pending. Later messages dispatch without extra user action. Release note: Agent 回复中的 HTML 现在可直接在会话内预览，支持查看源码和全屏预览，默认开启并可在“平台功能 / 通用设置”关闭；直连模型的长回复不再因大小限制中断；上一次运行失败或被中断后，新发送的消息会立即执行而不再排队等待。
2026-09-05 09:10:44 +08:00
parent 9588c4b901
commit a4b64a1641
35 changed files with 1669 additions and 195 deletions
@@ -1788,19 +1788,41 @@ describe('ModelAgentRuntime', () => {
    }
  })

-  it('bounds the total ordinary streaming response size', async () => {
-    const chunk = new TextEncoder().encode(
-      `data: ${JSON.stringify({
-        type: 'content_block_delta',
-        delta: {
-          type: 'text_delta',
-          text: 'x'.repeat(65_000)
-        }
-      })}\n\n`
-    )
+  it('streams long ordinary responses without a size limit', async () => {
+    const encoder = new TextEncoder()
+    const deltaChunks = 48
+    const deltaText = 'x'.repeat(65_000)
    const body = new ReadableStream<Uint8Array>({
-      pull(controller) {
-        controller.enqueue(chunk)
+      start(controller) {
+        controller.enqueue(
+          encoder.encode(
+            `data: ${JSON.stringify({
+              type: 'message_start',
+              message: {
+                id: 'message-long',
+                model: 'sonnet-5',
+                usage: { input_tokens: 5 }
+              }
+            })}\n\n`
+          )
+        )
+        for (let index = 0; index < deltaChunks; index += 1) {
+          controller.enqueue(
+            encoder.encode(
+              `data: ${JSON.stringify({
+                type: 'content_block_delta',
+                delta: {
+                  type: 'text_delta',
+                  text: deltaText
+                }
+              })}\n\n`
+            )
+          )
+        }
+        controller.enqueue(
+          encoder.encode('data: {"type":"message_stop"}\n\n')
+        )
+        controller.close()
      }
    })
    const runtime = new ModelAgentRuntime({
@@ -1816,22 +1838,26 @@ describe('ModelAgentRuntime', () => {
        })
      )
    })
-    const consume = async (): Promise<void> => {
-      for await (const _event of runtime.run(
-        {
-          requestId: crypto.randomUUID(),
-          conversationId: crypto.randomUUID(),
-          prompt: 'test'
-        },
-        new AbortController().signal
-      )) {
-        void _event
+    let streamedText = ''
+    let done = false
+    for await (const event of runtime.run(
+      {
+        requestId: crypto.randomUUID(),
+        conversationId: crypto.randomUUID(),
+        prompt: 'test'
+      },
+      new AbortController().signal
+    )) {
+      if (event.type === 'text') {
+        streamedText += event.delta
+      }
+      if (event.type === 'done') {
+        done = true
      }
    }

-    await expect(consume()).rejects.toThrow(
-      '流式响应超过安全限制'
-    )
+    expect(done).toBe(true)
+    expect(streamedText.length).toBe(deltaChunks * deltaText.length)
  })

  it('preserves bounded provider error messages', async () => {
@@ -5192,29 +5218,44 @@ describe('ModelAgentRuntime', () => {
    await replacement.dispose()
  })

-  it('counts image base64 data against the aggregate tool context limit', async () => {
-    const response = {
-      choices: [
-        {
-          message: {
-            role: 'assistant',
-            content: null,
-            tool_calls: [
-              {
-                id: 'call-large-image',
-                type: 'function',
-                function: {
-                  name: 'workspace_read_text',
-                  arguments: '{}'
-                }
-              }
-            ]
-          }
-        }
-      ]
-    }
+  it('keeps an oversized image tool result in the model round', async () => {
    const imageData = Buffer.alloc(1024 * 1024 + 1).toString('base64')
-    const fetcher = vi.fn<typeof fetch>(async () => Response.json(response))
+    const fetcher = vi
+      .fn<typeof fetch>()
+      .mockResolvedValueOnce(
+        Response.json({
+          choices: [
+            {
+              message: {
+                role: 'assistant',
+                content: null,
+                tool_calls: [
+                  {
+                    id: 'call-large-image',
+                    type: 'function',
+                    function: {
+                      name: 'workspace_read_text',
+                      arguments: '{}'
+                    }
+                  }
+                ]
+              }
+            }
+          ]
+        })
+      )
+      .mockResolvedValueOnce(
+        Response.json({
+          choices: [
+            {
+              message: {
+                role: 'assistant',
+                content: '图片已读取。'
+              }
+            }
+          ]
+        })
+      )
    const runtime = new ModelAgentRuntime({
      baseUrl: 'http://127.0.0.1:11434/v1',
      model: 'qwen3',
@@ -5234,23 +5275,25 @@ describe('ModelAgentRuntime', () => {
        }))
      })
    })
-    const consume = async (): Promise<void> => {
-      for await (const _event of runtime.run(
-        {
-          requestId: crypto.randomUUID(),
-          conversationId: crypto.randomUUID(),
-          prompt: 'run',
-          workMode: 'execute'
-        },
-        new AbortController().signal,
-        async () => 'once'
-      )) {
-        void _event
-      }
+    const events = []
+    for await (const event of runtime.run(
+      {
+        requestId: crypto.randomUUID(),
+        conversationId: crypto.randomUUID(),
+        prompt: 'run',
+        workMode: 'execute'
+      },
+      new AbortController().signal,
+      async () => 'once'
+    )) {
+      events.push(event)
    }

-    await expect(consume()).rejects.toThrow('结果总量超过 1MB')
-    expect(fetcher).toHaveBeenCalledOnce()
+    expect(fetcher).toHaveBeenCalledTimes(2)
+    expect(events.at(-1)).toMatchObject({ type: 'done' })
+    expect(fetcher.mock.calls[1]?.[1]?.body as string).toContain(
+      imageData
+    )
  })

  it('performs and validates a real image generation when testing an image connection', async () => {
@@ -189,10 +189,6 @@ type ModelToolResponse = {

 const maxGeneratedImageBytes = 3_900_000
 const maxImageResponseBytes = 5_300_000
-const maxChatResponseBytes = 2 * 1024 * 1024
-const maxStreamBlockBytes = 1024 * 1024
-const maxToolArgumentBytes = 128 * 1024
-const maxToolContextBytes = 1024 * 1024
 const defaultModelRequestTimeoutMs = 10 * 60_000
 const modelRequestRetryDelaysMs = [500, 1_000, 2_000] as const
 const retryablePreDispatchNetworkErrorCodes = new Set([
@@ -734,12 +730,16 @@ function parseGeneratedImage(value: unknown): {
  throw new Error('图像生成接口返回了不支持的图片格式')
 }

+async function readResponseText(response: Response): Promise<string> {
+  if (!response.body) {
+    throw new Error('模型接口未返回响应内容')
+  }
+  return response.text()
+}
+
 function parseToolArguments(value: unknown): Record<string, unknown> {
  let parsed = value
  if (typeof value === 'string') {
-    if (Buffer.byteLength(value) > maxToolArgumentBytes) {
-      throw new Error('模型工具参数超过 128KB 安全限制')
-    }
    try {
      parsed = JSON.parse(value)
    } catch (error) {
@@ -751,15 +751,11 @@ function parseToolArguments(value: unknown): Record<string, unknown> {
  if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
    throw new Error('模型工具参数必须是 JSON object')
  }
-  let serialized: string
  try {
-    serialized = JSON.stringify(parsed)
+    JSON.stringify(parsed)
  } catch (error) {
    throw new Error('模型工具参数无法序列化', { cause: error })
  }
-  if (Buffer.byteLength(serialized) > maxToolArgumentBytes) {
-    throw new Error('模型工具参数超过 128KB 安全限制')
-  }
  return parsed as Record<string, unknown>
 }

@@ -1232,7 +1228,7 @@ function parseSseData(
  }
 }

-async function* readBoundedSseBlocks(
+async function* readSseBlocks(
  response: Response
 ): AsyncGenerator<string, void, void> {
  if (!response.body) {
@@ -1242,19 +1238,11 @@ async function* readBoundedSseBlocks(
  const decoder = new TextDecoder()
  let buffer = ''
  let completed = false
-  let receivedBytes = 0
  try {
    while (true) {
      const { done, value } = await reader.read()
-      receivedBytes += value?.byteLength ?? 0
-      if (receivedBytes > maxChatResponseBytes) {
-        throw new Error('模型接口流式响应超过安全限制')
-      }
      buffer += decoder.decode(value, { stream: !done })
      buffer = buffer.replaceAll('\r\n', '\n')
-      if (Buffer.byteLength(buffer) > maxStreamBlockBytes) {
-        throw new Error('模型接口流式响应块超过安全限制')
-      }

      const blocks = buffer.split('\n\n')
      buffer = blocks.pop() ?? ''
@@ -1288,7 +1276,7 @@ async function* readOpenAIResponsesToolStream(
    reported: false
  }

-  for await (const block of readBoundedSseBlocks(response)) {
+  for await (const block of readSseBlocks(response)) {
    const parsed = parseSseData(block)
    if (parsed.stopped) {
      break
@@ -1423,7 +1411,7 @@ async function* readAnthropicToolStream(
  let reasoning = ''
  let stopReason: unknown

-  for await (const block of readBoundedSseBlocks(response)) {
+  for await (const block of readSseBlocks(response)) {
    const parsed = parseSseData(block)
    if (parsed.stopped) {
      break
@@ -1566,12 +1554,6 @@ async function* readAnthropicToolStream(
          throw new Error('Anthropic 返回了无效流式工具参数增量')
        }
        current.partialJson += delta.partial_json
-        if (
-          Buffer.byteLength(current.partialJson) >
-          maxToolArgumentBytes
-        ) {
-          throw new Error('模型工具参数超过 128KB 安全限制')
-        }
      }
      continue
    }
@@ -1952,13 +1934,14 @@ export class ModelAgentRuntime implements AgentRuntime {
            )
      )
    })
-    const responseText = await readBoundedResponseText(response, {
-      maxBytes: response.ok && imageGeneration
-        ? maxImageResponseBytes
-        : 128 * 1024,
-      missingBodyMessage: '模型接口未返回响应内容',
-      tooLargeMessage: '模型接口响应超过安全限制'
-    })
+    const responseText =
+      response.ok && imageGeneration
+        ? await readBoundedResponseText(response, {
+            maxBytes: maxImageResponseBytes,
+            missingBodyMessage: '模型接口未返回响应内容',
+            tooLargeMessage: '模型接口响应超过安全限制'
+          })
+        : await readResponseText(response)
    if (!response.ok) {
      let detail: string | undefined
      try {
@@ -2660,13 +2643,13 @@ export class ModelAgentRuntime implements AgentRuntime {
    const response = modelRequest.response
    let responseText: string
    try {
-      responseText = await readBoundedResponseText(response, {
-        maxBytes: response.ok
-          ? maxImageResponseBytes
-          : 128 * 1024,
-        missingBodyMessage: '模型接口未返回响应内容',
-        tooLargeMessage: '模型接口响应超过安全限制'
-      })
+      responseText = response.ok
+        ? await readBoundedResponseText(response, {
+            maxBytes: maxImageResponseBytes,
+            missingBodyMessage: '模型接口未返回响应内容',
+            tooLargeMessage: '模型接口响应超过安全限制'
+          })
+        : await readResponseText(response)
    } catch (error) {
      return normalizeRequestError(error, modelRequest.timedOut())
    } finally {
@@ -2828,9 +2811,6 @@ export class ModelAgentRuntime implements AgentRuntime {
              }
      )
    )
-    if (Buffer.byteLength(body) > 2 * 1024 * 1024) {
-      throw new Error('模型工具请求上下文超过 2MB 安全限制')
-    }
    const request = await this.fetchWithTimeout(
      this.getEndpoint(),
      {
@@ -2843,11 +2823,7 @@ export class ModelAgentRuntime implements AgentRuntime {
    const response = request.response
    try {
      if (!response.ok) {
-        const responseText = await readBoundedResponseText(response, {
-          maxBytes: 128 * 1024,
-          missingBodyMessage: '模型接口未返回响应内容',
-          tooLargeMessage: '模型接口响应超过安全限制'
-        })
+        const responseText = await readResponseText(response)
        let detail: string | undefined
        try {
          detail = getErrorMessage(
@@ -2890,7 +2866,7 @@ export class ModelAgentRuntime implements AgentRuntime {
        let reasoning = ''
        let receivedStop = false

-        for await (const block of readBoundedSseBlocks(response)) {
+        for await (const block of readSseBlocks(response)) {
          const parsed = parseSseData(block)
          if (parsed.stopped) {
            receivedStop = true
@@ -2972,16 +2948,6 @@ export class ModelAgentRuntime implements AgentRuntime {
                  ? functionDelta.name
                  : current.name
            }
-            if (
-              next.id.length > 256 ||
-              next.name.length > 128 ||
-              Buffer.byteLength(next.arguments) >
-                maxToolArgumentBytes
-            ) {
-              throw new Error(
-                'OpenAI 模型接口返回的流式工具调用超过安全限制'
-              )
-            }
            streamedToolCalls.set(index as number, next)
          }
        }
@@ -3025,11 +2991,7 @@ export class ModelAgentRuntime implements AgentRuntime {
          streamed: true
        }
      }
-      const responseText = await readBoundedResponseText(response, {
-        maxBytes: maxChatResponseBytes,
-        missingBodyMessage: '模型接口未返回响应内容',
-        tooLargeMessage: '模型接口响应超过安全限制'
-      })
+      const responseText = await readResponseText(response)
      let payload: unknown
      try {
        payload = responseText.trim()
@@ -3115,11 +3077,7 @@ export class ModelAgentRuntime implements AgentRuntime {
    } satisfies ModelUsageAccumulator
    try {
      if (!response.ok) {
-        const responseText = await readBoundedResponseText(response, {
-          maxBytes: 128 * 1024,
-          missingBodyMessage: '模型接口未返回响应内容',
-          tooLargeMessage: '模型接口响应超过安全限制'
-        })
+        const responseText = await readResponseText(response)
        let detail: string | undefined
        try {
          detail = getErrorMessage(
@@ -3136,7 +3094,7 @@ export class ModelAgentRuntime implements AgentRuntime {
      }

      let receivedStop = false
-      for await (const block of readBoundedSseBlocks(response)) {
+      for await (const block of readSseBlocks(response)) {
        const parsed = parseStreamBlock(block, this.options.protocol)
        if (parsed.usage) {
          applyUsageUpdate(usage, parsed.usage)
@@ -3619,9 +3577,6 @@ export class ModelAgentRuntime implements AgentRuntime {
      }
      if (response.text) {
        answer += response.text
-        if (Buffer.byteLength(answer) > 1024 * 1024) {
-          throw new Error('直连模型回答超过 1MB 安全限制')
-        }
        if (!response.streamed) {
          yield {
            requestId: request.requestId,
@@ -3844,25 +3799,6 @@ export class ModelAgentRuntime implements AgentRuntime {
          }
        }
        roundContextBytes += validateToolResult(result)
-        const retainedContextBytes = compressionState.rounds.reduce(
-          (total, retainedRound) =>
-            total + retainedRound.contextBytes,
-          roundContextBytes
-        )
-        if (retainedContextBytes > maxToolContextBytes) {
-          if (showToolActivity) {
-            yield {
-              requestId: request.requestId,
-              type: 'tool',
-              callId: call.id,
-              name: displayName,
-              state: 'failed',
-              summary: `直连模型工具结果超过限制：${displayName}`,
-              input
-            }
-          }
-          throw new Error('直连模型工具结果总量超过 1MB 安全限制')
-        }
        if (responses) {
          responsesResults.push({
            type: 'function_call_output',
@@ -65,6 +65,7 @@ describe('ApplicationSettingsStore', () => {
      updateSource: 'github',
      modelDownloadSource: 'modelscope',
      localToolEnvironment: defaultApplicationSettings.localToolEnvironment,
+      conversationHtmlRenderingEnabled: true,
      remoteProjectsEnabled: false,
      magicNotesEnabled: false,
      magicNotesShowIncompleteTodoCount: false,
@@ -76,6 +77,7 @@ describe('ApplicationSettingsStore', () => {
      updateSource: 'github',
      modelDownloadSource: 'modelscope',
      localToolEnvironment: defaultApplicationSettings.localToolEnvironment,
+      conversationHtmlRenderingEnabled: true,
      remoteProjectsEnabled: false,
      magicNotesEnabled: false,
      magicNotesShowIncompleteTodoCount: false,
@@ -83,11 +85,12 @@ describe('ApplicationSettingsStore', () => {
      magicNoteCommentFormat: 'combined'
    })
    expect(JSON.parse(await readFile(filePath, 'utf8'))).toEqual({
-      version: 10,
+      version: 11,
      checkUpdatesOnStartup: false,
      updateSource: 'github',
      modelDownloadSource: 'modelscope',
      localToolEnvironment: defaultApplicationSettings.localToolEnvironment,
+      conversationHtmlRenderingEnabled: true,
      remoteProjectsEnabled: false,
      magicNotesEnabled: false,
      magicNotesShowIncompleteTodoCount: false,
@@ -116,7 +119,7 @@ describe('ApplicationSettingsStore', () => {
      remoteProjectsEnabled: true
    })
    expect(JSON.parse(await readFile(filePath, 'utf8'))).toEqual({
-      version: 10,
+      version: 11,
      lastSeenReleaseNotesVersion: null,
      ...defaultApplicationSettings,
      remoteProjectsEnabled: true
@@ -139,6 +142,7 @@ describe('ApplicationSettingsStore', () => {
      updateSource: 'github',
      modelDownloadSource: 'modelscope',
      localToolEnvironment: defaultApplicationSettings.localToolEnvironment,
+      conversationHtmlRenderingEnabled: true,
      remoteProjectsEnabled: false,
      magicNotesEnabled: false,
      magicNotesShowIncompleteTodoCount: true,
@@ -165,6 +169,7 @@ describe('ApplicationSettingsStore', () => {
        updateSource: 'github',
        modelDownloadSource: 'modelscope',
        localToolEnvironment: defaultApplicationSettings.localToolEnvironment,
+        conversationHtmlRenderingEnabled: true,
        remoteProjectsEnabled: false,
        magicNotesEnabled: false,
        magicNotesShowIncompleteTodoCount: true,
@@ -191,6 +196,7 @@ describe('ApplicationSettingsStore', () => {
      updateSource: 'github',
      modelDownloadSource: 'modelscope',
      localToolEnvironment: defaultApplicationSettings.localToolEnvironment,
+      conversationHtmlRenderingEnabled: true,
      remoteProjectsEnabled: false,
      magicNotesEnabled: true,
      magicNotesShowIncompleteTodoCount: true,
@@ -217,6 +223,7 @@ describe('ApplicationSettingsStore', () => {
      updateSource: 'github',
      modelDownloadSource: 'modelscope',
      localToolEnvironment: defaultApplicationSettings.localToolEnvironment,
+      conversationHtmlRenderingEnabled: true,
      remoteProjectsEnabled: false,
      magicNotesEnabled: true,
      magicNotesShowIncompleteTodoCount: true,
@@ -245,11 +252,12 @@ describe('ApplicationSettingsStore', () => {
      createApplicationSettingsStore(filePath).getLastSeenReleaseNotesVersion()
    ).resolves.toBe('0.8.18')
    expect(JSON.parse(await readFile(filePath, 'utf8'))).toEqual({
-      version: 10,
+      version: 11,
      checkUpdatesOnStartup: false,
      updateSource: 'github',
      modelDownloadSource: 'modelscope',
      localToolEnvironment: defaultApplicationSettings.localToolEnvironment,
+      conversationHtmlRenderingEnabled: true,
      remoteProjectsEnabled: false,
      magicNotesEnabled: true,
      magicNotesShowIncompleteTodoCount: true,
@@ -279,6 +287,7 @@ describe('ApplicationSettingsStore', () => {
      updateSource: 'github',
      modelDownloadSource: 'modelscope',
      localToolEnvironment: defaultApplicationSettings.localToolEnvironment,
+      conversationHtmlRenderingEnabled: true,
      remoteProjectsEnabled: false,
      magicNotesEnabled: true,
      magicNotesShowIncompleteTodoCount: true,
@@ -306,6 +315,7 @@ describe('ApplicationSettingsStore', () => {
      updateSource: 'mirror',
      modelDownloadSource: 'modelscope',
      localToolEnvironment: defaultApplicationSettings.localToolEnvironment,
+      conversationHtmlRenderingEnabled: true,
      remoteProjectsEnabled: false,
      magicNotesEnabled: true,
      magicNotesShowIncompleteTodoCount: true,
@@ -314,9 +324,10 @@ describe('ApplicationSettingsStore', () => {
    })
    expect(JSON.parse(await readFile(filePath, 'utf8'))).toEqual({
      ...versionSix,
-      version: 10,
+      version: 11,
      modelDownloadSource: 'modelscope',
      localToolEnvironment: defaultApplicationSettings.localToolEnvironment,
+      conversationHtmlRenderingEnabled: true,
      remoteProjectsEnabled: false,
      magicNotesShowIncompleteTodoCount: true
    })
@@ -324,9 +335,10 @@ describe('ApplicationSettingsStore', () => {
    await store.update({ modelDownloadSource: 'hugging-face' })
    expect(JSON.parse(await readFile(filePath, 'utf8'))).toEqual({
      ...versionSix,
-      version: 10,
+      version: 11,
      modelDownloadSource: 'hugging-face',
      localToolEnvironment: defaultApplicationSettings.localToolEnvironment,
+      conversationHtmlRenderingEnabled: true,
      remoteProjectsEnabled: false,
      magicNotesShowIncompleteTodoCount: true
    })
@@ -351,6 +363,7 @@ describe('ApplicationSettingsStore', () => {
      updateSource: 'github',
      modelDownloadSource: 'modelscope',
      localToolEnvironment: defaultApplicationSettings.localToolEnvironment,
+      conversationHtmlRenderingEnabled: true,
      remoteProjectsEnabled: false,
      magicNotesEnabled: true,
      magicNotesShowIncompleteTodoCount: true,
@@ -359,8 +372,9 @@ describe('ApplicationSettingsStore', () => {
    })
    expect(JSON.parse(await readFile(filePath, 'utf8'))).toEqual({
      ...versionSeven,
-      version: 10,
+      version: 11,
      localToolEnvironment: defaultApplicationSettings.localToolEnvironment,
+      conversationHtmlRenderingEnabled: true,
      remoteProjectsEnabled: false,
      magicNotesShowIncompleteTodoCount: true
    })
@@ -388,6 +402,7 @@ describe('ApplicationSettingsStore', () => {
      updateSource: 'mirror',
      modelDownloadSource: 'hugging-face',
      localToolEnvironment: defaultApplicationSettings.localToolEnvironment,
+      conversationHtmlRenderingEnabled: true,
      remoteProjectsEnabled: false,
      magicNotesEnabled: true,
      magicNotesShowIncompleteTodoCount: false,
@@ -397,17 +412,19 @@ describe('ApplicationSettingsStore', () => {
    await expect(store.getLastSeenReleaseNotesVersion()).resolves.toBe('0.8.18')
    expect(JSON.parse(await readFile(filePath, 'utf8'))).toEqual({
      ...versionEight,
-      version: 10,
+      version: 11,
      localToolEnvironment: defaultApplicationSettings.localToolEnvironment,
+      conversationHtmlRenderingEnabled: true,
      remoteProjectsEnabled: false
    })

    await store.update({ checkUpdatesOnStartup: true })
    expect(JSON.parse(await readFile(filePath, 'utf8'))).toEqual({
      ...versionEight,
-      version: 10,
+      version: 11,
      checkUpdatesOnStartup: true,
      localToolEnvironment: defaultApplicationSettings.localToolEnvironment,
+      conversationHtmlRenderingEnabled: true,
      remoteProjectsEnabled: false
    })
  })
@@ -445,6 +462,7 @@ describe('ApplicationSettingsStore', () => {
      magicNotesShowIncompleteTodoCount: false,
      magicNoteCommentMode: 'after-save-manual',
      magicNoteCommentFormat: 'narrative',
+      conversationHtmlRenderingEnabled: true,
      localToolEnvironment: {
        node: {
          source: 'custom',
@@ -459,7 +477,8 @@ describe('ApplicationSettingsStore', () => {
    const persisted = JSON.parse(await readFile(filePath, 'utf8'))
    expect(persisted).toEqual({
      ...versionNine,
-      version: 10,
+      version: 11,
+      conversationHtmlRenderingEnabled: true,
      localToolEnvironment: {
        node: {
          source: 'custom',
@@ -523,6 +542,7 @@ describe('ApplicationSettingsStore', () => {
      updateSource: 'github',
      modelDownloadSource: 'modelscope',
      localToolEnvironment: defaultApplicationSettings.localToolEnvironment,
+      conversationHtmlRenderingEnabled: true,
      remoteProjectsEnabled: false,
      magicNotesEnabled: true,
      magicNotesShowIncompleteTodoCount: true,
@@ -546,6 +566,41 @@ describe('ApplicationSettingsStore', () => {
    })
  })

+  it('persists disabling conversation HTML rendering', async () => {
+    const { filePath, store } = await createStore()
+
+    await expect(
+      store.update({ conversationHtmlRenderingEnabled: false })
+    ).resolves.toEqual({
+      ...defaultApplicationSettings,
+      conversationHtmlRenderingEnabled: false
+    })
+    await expect(
+      createApplicationSettingsStore(filePath).get()
+    ).resolves.toEqual({
+      ...defaultApplicationSettings,
+      conversationHtmlRenderingEnabled: false
+    })
+  })
+
+  it('enables conversation HTML rendering when migrating version 10 settings', async () => {
+    const { filePath, store } = await createStore()
+    const versionTenSettings: Record<string, unknown> = {
+      ...defaultApplicationSettings,
+      version: 10,
+      lastSeenReleaseNotesVersion: '0.8.18'
+    }
+    delete versionTenSettings.conversationHtmlRenderingEnabled
+    await writeFile(filePath, JSON.stringify(versionTenSettings), 'utf8')
+
+    await expect(store.get()).resolves.toEqual(defaultApplicationSettings)
+    expect(JSON.parse(await readFile(filePath, 'utf8'))).toEqual({
+      ...versionTenSettings,
+      version: 11,
+      conversationHtmlRenderingEnabled: true
+    })
+  })
+
  it.each([
    '{not-json',
    JSON.stringify({
@@ -634,6 +689,7 @@ describe('ApplicationSettingsStore', () => {
      updateSource: 'github',
      modelDownloadSource: 'modelscope',
      localToolEnvironment: defaultApplicationSettings.localToolEnvironment,
+      conversationHtmlRenderingEnabled: true,
      remoteProjectsEnabled: false,
      magicNotesEnabled: false,
      magicNotesShowIncompleteTodoCount: true,
@@ -641,11 +697,12 @@ describe('ApplicationSettingsStore', () => {
      magicNoteCommentFormat: 'combined'
    })
    expect(JSON.parse(await readFile(filePath, 'utf8'))).toEqual({
-      version: 10,
+      version: 11,
      checkUpdatesOnStartup: false,
      updateSource: 'github',
      modelDownloadSource: 'modelscope',
      localToolEnvironment: defaultApplicationSettings.localToolEnvironment,
+      conversationHtmlRenderingEnabled: true,
      remoteProjectsEnabled: false,
      magicNotesEnabled: false,
      magicNotesShowIncompleteTodoCount: true,
@@ -674,6 +731,7 @@ describe('ApplicationSettingsStore', () => {
      updateSource: 'github',
      modelDownloadSource: 'modelscope',
      localToolEnvironment: defaultApplicationSettings.localToolEnvironment,
+      conversationHtmlRenderingEnabled: true,
      remoteProjectsEnabled: false,
      magicNotesEnabled: true,
      magicNotesShowIncompleteTodoCount: true,
@@ -27,7 +27,7 @@ export {
 } from '../shared/application-settings-contracts'
 export type { ApplicationSettings } from '../shared/application-settings-contracts'

-const CURRENT_SETTINGS_VERSION = 10
+const CURRENT_SETTINGS_VERSION = 11

 const legacyStoredApplicationSettingsSchema = z
  .object({
@@ -58,6 +58,7 @@ const versionFourStoredApplicationSettingsSchema = applicationSettingsSchema
    updateSource: true,
    modelDownloadSource: true,
    localToolEnvironment: true,
+    conversationHtmlRenderingEnabled: true,
    remoteProjectsEnabled: true,
    magicNotesShowIncompleteTodoCount: true
  })
@@ -71,6 +72,7 @@ const versionFiveStoredApplicationSettingsSchema = applicationSettingsSchema
    updateSource: true,
    modelDownloadSource: true,
    localToolEnvironment: true,
+    conversationHtmlRenderingEnabled: true,
    remoteProjectsEnabled: true,
    magicNotesShowIncompleteTodoCount: true
  })
@@ -84,6 +86,7 @@ const versionSixStoredApplicationSettingsSchema = applicationSettingsSchema
  .omit({
    modelDownloadSource: true,
    localToolEnvironment: true,
+    conversationHtmlRenderingEnabled: true,
    remoteProjectsEnabled: true,
    magicNotesShowIncompleteTodoCount: true
  })
@@ -96,6 +99,7 @@ const versionSixStoredApplicationSettingsSchema = applicationSettingsSchema
 const versionSevenStoredApplicationSettingsSchema = applicationSettingsSchema
  .omit({
    localToolEnvironment: true,
+    conversationHtmlRenderingEnabled: true,
    remoteProjectsEnabled: true,
    magicNotesShowIncompleteTodoCount: true
  })
@@ -108,6 +112,7 @@ const versionSevenStoredApplicationSettingsSchema = applicationSettingsSchema
 const versionEightStoredApplicationSettingsSchema = applicationSettingsSchema
  .omit({
    localToolEnvironment: true,
+    conversationHtmlRenderingEnabled: true,
    remoteProjectsEnabled: true
  })
  .extend({
@@ -117,13 +122,25 @@ const versionEightStoredApplicationSettingsSchema = applicationSettingsSchema
  .strict()

 const versionNineStoredApplicationSettingsSchema = applicationSettingsSchema
-  .omit({ localToolEnvironment: true })
+  .omit({
+    localToolEnvironment: true,
+    conversationHtmlRenderingEnabled: true
+  })
  .extend({
    version: z.literal(9),
    lastSeenReleaseNotesVersion: releaseVersionSchema.nullable()
  })
  .strict()

+const versionTenStoredApplicationSettingsSchema =
+  applicationSettingsSchema
+    .omit({ conversationHtmlRenderingEnabled: true })
+    .extend({
+      version: z.literal(10),
+      lastSeenReleaseNotesVersion: releaseVersionSchema.nullable()
+    })
+    .strict()
+
 const storedApplicationSettingsSchema = applicationSettingsSchema
  .extend({
    version: z.literal(CURRENT_SETTINGS_VERSION),
@@ -215,6 +232,7 @@ export const defaultApplicationSettings: ApplicationSettings = {
  updateSource: 'github',
  modelDownloadSource: 'modelscope',
  localToolEnvironment: defaultLocalToolEnvironmentSettings,
+  conversationHtmlRenderingEnabled: true,
  remoteProjectsEnabled: false,
  magicNotesEnabled: false,
  magicNotesShowIncompleteTodoCount: true,
@@ -236,8 +254,13 @@ export class ApplicationSettingsStore {
  private async migrateLegacy(
    settings: Omit<
      StoredApplicationSettings,
-      'localToolEnvironment' | 'version'
-    > & { version: number }
+      | 'conversationHtmlRenderingEnabled'
+      | 'localToolEnvironment'
+      | 'version'
+    > & {
+      conversationHtmlRenderingEnabled?: boolean
+      version: number
+    }
  ): Promise<StoredApplicationSettings> {
    const resolved = await this.legacyLocalToolEnvironmentResolver()
    const selection = (
@@ -249,6 +272,8 @@ export class ApplicationSettingsStore {
        : { source: 'managed' }
    const next: StoredApplicationSettings = {
      ...settings,
+      conversationHtmlRenderingEnabled:
+        settings.conversationHtmlRenderingEnabled ?? true,
      version: CURRENT_SETTINGS_VERSION,
      localToolEnvironment: {
        node: selection(resolved.nodeExecutablePath),
@@ -303,6 +328,17 @@ export class ApplicationSettingsStore {
      )
      const result = storedApplicationSettingsSchema.safeParse(parsed)
      if (!result.success) {
+        const versionTenResult =
+          versionTenStoredApplicationSettingsSchema.safeParse(parsed)
+        if (versionTenResult.success) {
+          const next: StoredApplicationSettings = {
+            ...versionTenResult.data,
+            version: CURRENT_SETTINGS_VERSION,
+            conversationHtmlRenderingEnabled: true
+          }
+          await this.persist(next)
+          return next
+        }
        const versionNineResult =
          versionNineStoredApplicationSettingsSchema.safeParse(parsed)
        if (versionNineResult.success) {
@@ -443,6 +479,8 @@ export class ApplicationSettingsStore {
      updateSource: stored.updateSource,
      modelDownloadSource: stored.modelDownloadSource,
      localToolEnvironment: stored.localToolEnvironment,
+      conversationHtmlRenderingEnabled:
+        stored.conversationHtmlRenderingEnabled,
      remoteProjectsEnabled: stored.remoteProjectsEnabled,
      magicNotesEnabled: stored.magicNotesEnabled,
      magicNotesShowIncompleteTodoCount:
@@ -478,6 +516,8 @@ export class ApplicationSettingsStore {
        updateSource: next.updateSource,
        modelDownloadSource: next.modelDownloadSource,
        localToolEnvironment: next.localToolEnvironment,
+        conversationHtmlRenderingEnabled:
+          next.conversationHtmlRenderingEnabled,
        remoteProjectsEnabled: next.remoteProjectsEnabled,
        magicNotesEnabled: next.magicNotesEnabled,
        magicNotesShowIncompleteTodoCount:
@@ -6710,6 +6710,221 @@ describe('registerIpcHandlers agent terminal state', () => {
    await harness.dispose()
  })

+  it('releases the queue reservation when a dispatched run cannot start', async () => {
+    const runtime = {
+      runtimeId: 'model',
+      capability: 'chat',
+      supportsToolExecution: false,
+      async *run(request: { requestId: string }) {
+        yield {
+          requestId: request.requestId,
+          type: 'done'
+        } as const
+      }
+    }
+    const harness = createHarness(runtime)
+    const conversationId =
+      '00000000-0000-4000-8000-000000000745'
+    const itemId = '00000000-0000-4000-8000-000000000746'
+    const input = {
+      conversationId,
+      runtimeSelection: { provider: 'auto' as const },
+      workMode: 'ask' as const,
+      includeMemoryContext: true,
+      prompt: '需要重新排队',
+      attachments: [],
+      knowledgeLibraryIds: [],
+      knowledgeRetrievalMode: 'auto' as const
+    }
+    const item = {
+      id: itemId,
+      conversationId,
+      source: 'user' as const,
+      label: input.prompt,
+      createdAt: '2026-08-21T00:02:00.000Z'
+    }
+    harness.assistantDatabase.enqueueConversationUserInput.mockReturnValue(
+      item
+    )
+    harness.assistantDatabase.listConversationQueueItems
+      .mockReturnValueOnce([item])
+      .mockReturnValue([])
+    harness.assistantDatabase.claimConversationQueueItem.mockReturnValueOnce(
+      {
+        source: 'user',
+        item,
+        payloadJson: JSON.stringify({
+          input,
+          serializedContexts: '[]'
+        })
+      }
+    )
+    harness.assistantDatabase.getConversationQueueItem.mockReturnValue(
+      item
+    )
+    harness.assistantDatabase.createTask.mockImplementationOnce(() => {
+      throw new Error('会话记录不可用')
+    })
+
+    electronMocks.handlers.get(
+      ipcChannels.conversationQueueEnqueueUser
+    )?.(trustedEvent(harness.webContents), input)
+    await vi.waitFor(() =>
+      expect(harness.webContents.send).toHaveBeenCalledWith(
+        ipcChannels.conversationQueueDispatch,
+        { item, input }
+      )
+    )
+
+    await expect(
+      harness.handler?.(trustedEvent(harness.webContents), {
+        requestId: '00000000-0000-4000-8000-000000000747',
+        conversationId,
+        queueItemId: itemId,
+        runtimeSelection: input.runtimeSelection,
+        prompt: input.prompt,
+        workMode: input.workMode,
+        knowledgeLibraryIds: []
+      })
+    ).rejects.toThrow('会话记录不可用')
+
+    expect(
+      harness.assistantDatabase.releaseConversationUserQueueItem
+    ).toHaveBeenCalledWith(itemId)
+    await harness.handler?.(trustedEvent(harness.webContents), {
+      requestId: '00000000-0000-4000-8000-000000000748',
+      conversationId,
+      runtimeSelection: { provider: 'auto' },
+      prompt: '失败后的新消息',
+      workMode: 'ask',
+      knowledgeLibraryIds: []
+    })
+    await harness.dispose()
+  })
+
+  it('dispatches a message queued during a run that later fails', async () => {
+    let failRun: ((error: Error) => void) | undefined
+    const runtimeStarted = vi.fn()
+    const runtime = {
+      runtimeId: 'model',
+      capability: 'chat',
+      supportsToolExecution: false,
+      // eslint-disable-next-line require-yield
+      async *run(request: { requestId: string }) {
+        runtimeStarted(request.requestId)
+        throw await new Promise<Error>((resolve) => {
+          failRun = resolve
+        })
+      }
+    }
+    const harness = createHarness(runtime)
+    const conversationId =
+      '00000000-0000-4000-8000-000000000751'
+    const createItem = (id: string, prompt: string) => {
+      const input = {
+        conversationId,
+        runtimeSelection: { provider: 'auto' as const },
+        workMode: 'ask' as const,
+        includeMemoryContext: true,
+        prompt,
+        attachments: [],
+        knowledgeLibraryIds: [],
+        knowledgeRetrievalMode: 'auto' as const
+      }
+      return {
+        input,
+        item: {
+          id,
+          conversationId,
+          source: 'user' as const,
+          label: prompt,
+          createdAt: '2026-08-21T00:03:00.000Z'
+        }
+      }
+    }
+    const first = createItem(
+      '00000000-0000-4000-8000-000000000752',
+      '会失败的消息'
+    )
+    const second = createItem(
+      '00000000-0000-4000-8000-000000000753',
+      '失败之后的新消息'
+    )
+    harness.assistantDatabase.enqueueConversationUserInput
+      .mockReturnValueOnce(first.item)
+      .mockReturnValueOnce(second.item)
+    harness.assistantDatabase.listConversationQueueItems
+      .mockReturnValueOnce([first.item])
+      .mockReturnValueOnce([second.item])
+      .mockReturnValue([])
+    harness.assistantDatabase.claimConversationQueueItem
+      .mockReturnValueOnce({
+        source: 'user',
+        item: first.item,
+        payloadJson: JSON.stringify({
+          input: first.input,
+          serializedContexts: '[]'
+        })
+      })
+      .mockReturnValueOnce({
+        source: 'user',
+        item: second.item,
+        payloadJson: JSON.stringify({
+          input: second.input,
+          serializedContexts: '[]'
+        })
+      })
+    harness.assistantDatabase.getConversationQueueItem.mockImplementation(
+      (id: string) =>
+        id === first.item.id ? first.item : second.item
+    )
+
+    electronMocks.handlers.get(
+      ipcChannels.conversationQueueEnqueueUser
+    )?.(trustedEvent(harness.webContents), first.input)
+    await vi.waitFor(() =>
+      expect(harness.webContents.send).toHaveBeenCalledWith(
+        ipcChannels.conversationQueueDispatch,
+        { item: first.item, input: first.input }
+      )
+    )
+
+    await harness.handler?.(trustedEvent(harness.webContents), {
+      requestId: '00000000-0000-4000-8000-000000000754',
+      conversationId,
+      queueItemId: first.item.id,
+      runtimeSelection: first.input.runtimeSelection,
+      prompt: first.input.prompt,
+      workMode: first.input.workMode,
+      knowledgeLibraryIds: []
+    })
+    await vi.waitFor(() => expect(runtimeStarted).toHaveBeenCalled())
+
+    // The next message arrives while the run is still in flight, so the
+    // renderer never reports readiness for it afterwards.
+    electronMocks.handlers.get(
+      ipcChannels.conversationQueueEnqueueUser
+    )?.(trustedEvent(harness.webContents), second.input)
+    failRun?.(new Error('模型接口请求失败'))
+    await vi.waitFor(() =>
+      expect(
+        harness.assistantDatabase.updateTaskStatus
+      ).toHaveBeenCalledWith(
+        '00000000-0000-4000-8000-000000000754',
+        'failed',
+        expect.any(String)
+      )
+    )
+
+    await vi.waitFor(() =>
+      expect(harness.webContents.send).toHaveBeenCalledWith(
+        ipcChannels.conversationQueueDispatch,
+        { item: second.item, input: second.input }
+      )
+    )
+    await harness.dispose()
+  })
+
  it('publishes Runtime usage as context metrics with one settings read', async () => {
    const runtime = {
      runtimeId: 'continue',
@@ -4527,9 +4527,11 @@ export function registerIpcHandlers(
          pendingGoodBuddyConfigReload = true
        }
        await flushGoodBuddyConfigReload().catch(() => undefined)
-        if (readyConversationQueues.has(request.conversationId)) {
-          void pumpConversationQueue(request.conversationId)
-        }
+        // The renderer also reports readiness after a finished run, but a
+        // run that fails before publishing a terminal event never triggers
+        // that call, which would leave later messages queued forever.
+        readyConversationQueues.add(request.conversationId)
+        void pumpConversationQueue(request.conversationId)
      }
    })()
    if (managedSshExecution) {
@@ -4542,6 +4544,35 @@ export function registerIpcHandlers(
    }
    } finally {
      preparingRequestConversations.delete(parsedInput.requestId)
+      // A dispatched queue item whose run never started keeps the
+      // conversation reserved, so later messages would stay queued
+      // forever instead of running.
+      if (
+        parsedInput.queueItemId &&
+        reservedConversationQueueItems.get(
+          parsedInput.conversationId
+        ) === parsedInput.queueItemId
+      ) {
+        reservedConversationQueueItems.delete(
+          parsedInput.conversationId
+        )
+        const dispatchTimeout = queueDispatchTimers.get(
+          parsedInput.queueItemId
+        )
+        if (dispatchTimeout) {
+          clearTimeout(dispatchTimeout)
+          queueDispatchTimers.delete(parsedInput.queueItemId)
+        }
+        try {
+          assistantDatabase.releaseConversationUserQueueItem(
+            parsedInput.queueItemId
+          )
+        } catch {
+          // The renderer may have released the item already.
+        }
+        readyConversationQueues.add(parsedInput.conversationId)
+        publishConversationQueueChange(parsedInput.conversationId)
+      }
    }
  })