From 2076b1e57e16aa224c45db46978b46456a14b895 Mon Sep 17 00:00:00 2001 From: Liad Yosef Date: Wed, 8 Jul 2026 07:13:18 +0300 Subject: [PATCH] docs: remove leftover merge conflict markers from MCP Apps guide Raw conflict markers from #179 were committed into docs/src/guide/mcp-apps.md and are rendered on the published docs page. Both conflicting sections are valid, non-overlapping content (Customizing Host Identity and Handling Custom Requests), so keep both and drop the markers. Co-Authored-By: Claude Fable 5 --- docs/src/guide/mcp-apps.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/src/guide/mcp-apps.md b/docs/src/guide/mcp-apps.md index 8f9afb0f..81fd93d5 100644 --- a/docs/src/guide/mcp-apps.md +++ b/docs/src/guide/mcp-apps.md @@ -508,7 +508,6 @@ function ToolUI({ client, toolName, toolInput, toolResult }) { - `sendPromptListChanged()` - Notify guest when prompts change - `teardownResource()` - Clean up before unmounting -<<<<<<< copilot/add-hostinfo-hostcapabilities-props ### Customizing Host Identity By default, `AppRenderer` identifies itself as "MCP-UI Host" to guest apps. You can customize the host identity and capabilities to properly identify your application: @@ -544,7 +543,7 @@ function ToolUI({ client, toolName }) { ``` This allows guest apps to know they're running in your specific host application and what capabilities are available. -======= + ### Handling Custom Requests (`onFallbackRequest`) AppRenderer includes built-in handlers for standard MCP Apps methods (`tools/call`, `ui/message`, `ui/open-link`, etc.). The `onFallbackRequest` prop lets you handle **any JSON-RPC request that doesn't match a built-in handler**. This is useful for: @@ -593,7 +592,6 @@ The `sendExperimentalRequest` helper sends a properly formatted JSON-RPC request ::: tip Method Naming Convention Use the `x//` prefix for experimental methods (e.g., `x/clipboard/write`). Standard MCP methods not yet in the Apps spec (e.g., `sampling/createMessage`) should use their canonical method names. When an experimental method proves useful, it can be promoted to a standard method in the [ext-apps spec](https://github.com/modelcontextprotocol/ext-apps). ::: ->>>>>>> main ### Using Without an MCP Client