Skip to content

fix: prevent duplicate rendering when tool returns both mcp-ui and mcp-apps resources #6378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexhancock merged 4 commits into from
Jan 7, 2026
Merged

fix: prevent duplicate rendering when tool returns both mcp-ui and mcp-apps resources #6378

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cdae031
fix: update MCP Apps _meta.ui.resourceUri to use nested format (SEP-1…
aharvard Jan 7, 2026
cfa6fac
Merge branch 'main' into aharvard/mcp-ui-and-mcp-apps-separation
aharvard Jan 7, 2026
754d8f6
fix: update ToolCallWithResponse to conditionally render based on MCP…
aharvard Jan 7, 2026
44dd11d
fix: check both toolRequest and toolResponse for MCP App resource URI
aharvard Jan 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions ui/desktop/src/components/ToolCallWithResponse.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,12 @@ export default function ToolCallWithResponse({
return null;
}

const requestWithMeta = toolRequest as ToolRequestWithMeta;
const resultWithMeta = toolResponse?.toolResult as ToolResultWithMeta;
const hasMcpAppResourceURI = Boolean(
requestWithMeta._meta?.ui?.resourceUri || resultWithMeta?.value?._meta?.ui?.resourceUri
);

return (
<>
<div
Expand All @@ -181,7 +187,8 @@ export default function ToolCallWithResponse({
/>
</div>
{/* MCP UI — Inline */}
{toolResponse?.toolResult &&
{!hasMcpAppResourceURI &&
toolResponse?.toolResult &&
getToolResultContent(toolResponse.toolResult).map((content, index) => {
const resourceContent = isEmbeddedResource(content)
? { ...content, type: 'resource' as const }
Expand All @@ -203,7 +210,7 @@ export default function ToolCallWithResponse({
}
})}

{sessionId && (
{hasMcpAppResourceURI && sessionId && (
<McpAppWrapper
toolRequest={toolRequest}
toolResponse={toolResponse}
Expand Down
Loading