Skip to content

Commit b8f2d4a

Browse files
liadyclaude
andauthored
docs: remove leftover merge conflict markers from MCP Apps guide (#210)
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 <noreply@anthropic.com>
1 parent 33de6b6 commit b8f2d4a

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

docs/src/guide/mcp-apps.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,6 @@ function ToolUI({ client, toolName, toolInput, toolResult }) {
508508
- `sendPromptListChanged()` - Notify guest when prompts change
509509
- `teardownResource()` - Clean up before unmounting
510510

511-
<<<<<<< copilot/add-hostinfo-hostcapabilities-props
512511
### Customizing Host Identity
513512

514513
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 }) {
544543
```
545544

546545
This allows guest apps to know they're running in your specific host application and what capabilities are available.
547-
=======
546+
548547
### Handling Custom Requests (`onFallbackRequest`)
549548

550549
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
593592
::: tip Method Naming Convention
594593
Use the `x/<namespace>/<action>` 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).
595594
:::
596-
>>>>>>> main
597595

598596
### Using Without an MCP Client
599597

0 commit comments

Comments
 (0)