Prefer structuredContent over content field in tool responses

Some MCP servers return different data in structuredContent vs content fields.
This change ensures that when structuredContent is present, it is used
exclusively for display instead of showing both fields.

Changes:
- Modified ToolResults.tsx to only show content when structuredContent is absent
- Removed unused checkContentCompatibility function
- Updated test cases to reflect new behavior

Co-authored-by: Cliff Hall <cliffhall@users.noreply.github.com>

Author: github-actions[bot]

client/src/components/ToolResults.tsx

@@ -15,56 +15,6 @@ interface ToolResultsProps {
   isPollingTask?: boolean;
 }
 
-const checkContentCompatibility = (
-  structuredContent: unknown,
-  unstructuredContent: Array<{
-    type: string;
-    text?: string;
-    [key: string]: unknown;
-  }>,
-): { isCompatible: boolean; message: string } => {
-  // Look for at least one text content block that matches the structured content
-  const textBlocks = unstructuredContent.filter(
-    (block) => block.type === "text",
-  );
-
-  if (textBlocks.length === 0) {
-    return {
-      isCompatible: false,
-      message: "No text blocks to match structured content",
-    };
-  }
-
-  // Check if any text block contains JSON that matches the structured content
-  for (const textBlock of textBlocks) {
-    const textContent = textBlock.text;
-    if (!textContent) {
-      continue;
-    }
-
-    try {
-      const parsedContent = JSON.parse(textContent);
-      const isEqual =
-        JSON.stringify(parsedContent) === JSON.stringify(structuredContent);
-
-      if (isEqual) {
-        return {
-          isCompatible: true,
-          message: `Structured content matches text block${textBlocks.length > 1 ? " (multiple blocks)" : ""}${unstructuredContent.length > textBlocks.length ? " + other content" : ""}`,
-        };
-      }
-    } catch {
-      // Continue to next text block if this one doesn't parse as JSON
-      continue;
-    }
-  }
-
-  return {
-    isCompatible: false,
-    message: "No text block matches structured content",
-  };
-};
-
 const ToolResults = ({
   toolResult,
   selectedTool,
@@ -123,19 +73,6 @@ const ToolResults = ({
       }
     }
 
-    let compatibilityResult = null;
-    if (
-      structuredResult.structuredContent &&
-      structuredResult.content.length > 0 &&
-      selectedTool &&
-      hasOutputSchema(selectedTool.name)
-    ) {
-      compatibilityResult = checkContentCompatibility(
-        structuredResult.structuredContent,
-        structuredResult.content,
-      );
-    }
-
     return (
       <>
         <h4 className="font-semibold mb-2">
@@ -188,66 +125,48 @@ const ToolResults = ({
               </div>
             </div>
           )}
-        {structuredResult.content.length > 0 && (
-          <div className="mb-4">
-            {structuredResult.structuredContent && (
-              <>
-                <h5 className="font-semibold mb-2 text-sm">
-                  Unstructured Content:
-                </h5>
-                {compatibilityResult && (
-                  <div
-                    className={`mb-2 p-2 rounded text-sm ${
-                      compatibilityResult.isCompatible
-                        ? "bg-blue-100 dark:bg-blue-900 text-blue-800 dark:text-blue-200"
-                        : "bg-yellow-100 dark:bg-yellow-900 text-yellow-800 dark:text-yellow-200"
-                    }`}
-                  >
-                    {compatibilityResult.isCompatible ? "✓" : "⚠"}{" "}
-                    {compatibilityResult.message}
-                  </div>
-                )}
-              </>
-            )}
-            {structuredResult.content.map((item, index) => (
-              <div key={index} className="mb-2">
-                {item.type === "text" && (
-                  <JsonView data={item.text} isError={isError} />
-                )}
-                {item.type === "image" && (
-                  <img
-                    src={`data:${item.mimeType};base64,${item.data}`}
-                    alt="Tool result image"
-                    className="max-w-full h-auto"
-                  />
-                )}
-                {item.type === "resource" &&
-                  (item.resource?.mimeType?.startsWith("audio/") &&
-                  "blob" in item.resource ? (
-                    <audio
-                      controls
-                      src={`data:${item.resource.mimeType};base64,${item.resource.blob}`}
-                      className="w-full"
-                    >
-                      <p>Your browser does not support audio playback</p>
-                    </audio>
-                  ) : (
-                    <JsonView data={item.resource} />
-                  ))}
-                {item.type === "resource_link" && (
-                  <ResourceLinkView
-                    uri={item.uri}
-                    name={item.name}
-                    description={item.description}
-                    mimeType={item.mimeType}
-                    resourceContent={resourceContent[item.uri] || ""}
-                    onReadResource={onReadResource}
-                  />
-                )}
-              </div>
-            ))}
-          </div>
-        )}
+        {structuredResult.content.length > 0 &&
+          !structuredResult.structuredContent && (
+            <div className="mb-4">
+              {structuredResult.content.map((item, index) => (
+                <div key={index} className="mb-2">
+                  {item.type === "text" && (
+                    <JsonView data={item.text} isError={isError} />
+                  )}
+                  {item.type === "image" && (
+                    <img
+                      src={`data:${item.mimeType};base64,${item.data}`}
+                      alt="Tool result image"
+                      className="max-w-full h-auto"
+                    />
+                  )}
+                  {item.type === "resource" &&
+                    (item.resource?.mimeType?.startsWith("audio/") &&
+                    "blob" in item.resource ? (
+                      <audio
+                        controls
+                        src={`data:${item.resource.mimeType};base64,${item.resource.blob}`}
+                        className="w-full"
+                      >
+                        <p>Your browser does not support audio playback</p>
+                      </audio>
+                    ) : (
+                      <JsonView data={item.resource} />
+                    ))}
+                  {item.type === "resource_link" && (
+                    <ResourceLinkView
+                      uri={item.uri}
+                      name={item.name}
+                      description={item.description}
+                      mimeType={item.mimeType}
+                      resourceContent={resourceContent[item.uri] || ""}
+                      onReadResource={onReadResource}
+                    />
+                  )}
+                </div>
+              ))}
+            </div>
+          )}
       </>
     );
   } else if ("toolResult" in toolResult) {

client/src/components/__tests__/ToolsTab.test.tsx

@@ -483,7 +483,7 @@ describe("ToolsTab", () => {
       ).toBeInTheDocument();
     });
 
-    it("should show unstructured content title when both structured and unstructured exist", () => {
+    it("should prefer structured content when both structured and unstructured exist", () => {
       const resultWithBoth = {
         content: [{ type: "text", text: '{"temperature": 25}' }],
         structuredContent: { temperature: 25 },
@@ -496,7 +496,10 @@ describe("ToolsTab", () => {
       });
 
       expect(screen.getByText("Structured Content:")).toBeInTheDocument();
-      expect(screen.getByText("Unstructured Content:")).toBeInTheDocument();
+      // Should not show unstructured content when structured content is present
+      expect(
+        screen.queryByText("Unstructured Content:"),
+      ).not.toBeInTheDocument();
     });
 
     it("should not show unstructured content title when only unstructured exists", () => {
@@ -514,7 +517,7 @@ describe("ToolsTab", () => {
       ).not.toBeInTheDocument();
     });
 
-    it("should show compatibility check when tool has output schema", () => {
+    it("should show only structured content when tool has output schema", () => {
       const compatibleResult = {
         content: [{ type: "text", text: '{"temperature": 25}' }],
         structuredContent: { temperature: 25 },
@@ -526,13 +529,14 @@ describe("ToolsTab", () => {
         toolResult: compatibleResult,
       });
 
-      // Should show compatibility result
+      // Should show structured content and not show unstructured content
+      expect(screen.getByText("Structured Content:")).toBeInTheDocument();
       expect(
-        screen.getByText(/structured content matches/i),
-      ).toBeInTheDocument();
+        screen.queryByText(/structured content matches/i),
+      ).not.toBeInTheDocument();
     });
 
-    it("should accept multiple content blocks with structured output", () => {
+    it("should prefer structured content over multiple content blocks", () => {
       const multipleBlocksResult = {
         content: [
           { type: "text", text: "Here is the weather data:" },
@@ -548,10 +552,11 @@ describe("ToolsTab", () => {
         toolResult: multipleBlocksResult,
       });
 
-      // Should show compatible result with multiple blocks
+      // Should show structured content and hide unstructured content blocks
+      expect(screen.getByText("Structured Content:")).toBeInTheDocument();
       expect(
-        screen.getByText(/structured content matches.*multiple/i),
-      ).toBeInTheDocument();
+        screen.queryByText("Here is the weather data:"),
+      ).not.toBeInTheDocument();
     });
 
     it("should accept mixed content types with structured output", () => {