From 8b03c9dcb8990bd27543e55a9b533a72aea42a62 Mon Sep 17 00:00:00 2001
From: fvoid <fv729164860@gmail.com>
Date: Wed, 25 Feb 2026 13:14:21 +0800
Subject: [PATCH] IDEA-386673 MCP structured output error responses incorrectly
 validated against success schema

---
 .../src/com/intellij/mcpserver/impl/McpServerService.kt         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mcp-server/src/com/intellij/mcpserver/impl/McpServerService.kt b/plugins/mcp-server/src/com/intellij/mcpserver/impl/McpServerService.kt
index eb25464989262..c147c386f8e32 100644
--- a/plugins/mcp-server/src/com/intellij/mcpserver/impl/McpServerService.kt
+++ b/plugins/mcp-server/src/com/intellij/mcpserver/impl/McpServerService.kt
@@ -798,7 +798,7 @@ private fun McpToolCallResult.toSdkToolCallResult(): CallToolResult {
       is McpToolCallResultContent.Text -> TextContent(content.text)
     }
   }
-  val structuredContent = if (structuredToolOutputEnabled) structuredContent else null
+  val structuredContent = if (structuredToolOutputEnabled && !isError) structuredContent else null
   val callToolResult = CallToolResult(content = contents, structuredContent = structuredContent, isError = isError)
   return callToolResult
 }