Replace mcp_core::content types with rmcp::model types #3500

jamadeo · 2025-07-18T03:46:58Z

Basically, delete crates/mcp-core/src/content.rs and add in rmcp types in its place. Kicked off by me and mostly done by Goose+Claude.

crates/goose-cli/src/session/export.rs

Copilot

Pull Request Overview

This PR replaces the mcp_core::content module with types from the rmcp::model crate, consolidating content type definitions and removing duplicate implementations. This is part of a broader migration strategy to unify content types across the codebase.

Removes the entire mcp_core/src/content.rs file containing Content, TextContent, ImageContent, Annotations, and EmbeddedResource types
Updates all imports throughout the codebase to use rmcp::model equivalents instead
Adapts code to work with the new type structure, particularly the "raw" wrapper pattern used in rmcp types

Reviewed Changes

Copilot reviewed 61 out of 62 changed files in this pull request and generated 8 comments.

Show a summary per file

File	Description
crates/mcp-core/src/content.rs	Complete removal of content type definitions
crates/mcp-core/src/lib.rs	Removes content module exports
crates/mcp-core/src/protocol.rs	Updates Content import to use rmcp
crates/mcp-core/src/prompt.rs	Updates content type usage and structure adaptation
crates/mcp-server/src/main.rs	Updates Content import source
crates/mcp-server/src/router.rs	Updates Content import source
crates/mcp-server/Cargo.toml	Adds rmcp workspace dependency
crates/goose/src/message.rs	Major updates to content type handling and conversions
Multiple goose provider format files	Updates to handle new content structure with raw wrapper
Multiple test files	Updates test code to use new content APIs

crates/goose/src/providers/formats/openai.rs

crates/goose/src/providers/formats/google.rs

crates/goose/src/providers/formats/databricks.rs

crates/goose/src/message.rs

crates/goose/src/providers/formats/bedrock.rs

crates/goose/src/session/storage.rs

crates/goose/src/providers/formats/openai.rs

crates/goose/src/providers/formats/databricks.rs

jamadeo · 2025-07-18T13:16:53Z

crates/goose-cli/src/session/mod.rs

+                }
+            }
+        }).collect();
+        Ok(converted_messages)


This should go away once we do the PromptMessage migration. But we needed to do a bit of it here since we want to work with the rmcp content types.

crates/goose/src/context_mgmt/truncate.rs

crates/goose/src/message.rs

jamadeo · 2025-07-18T19:38:13Z

ui/desktop/src/api/types.gen.ts

+    data: string;
+    mimeType: string;
+    type: string;
+};


this looks like a bit less useful than what we had before

are there any frontend imports of this that may need to be updated? we don't have a ton of testing in the frontend unfortunately

Yeah the TS checker passing does give some confidence that this change is OK, but I'll pay some extra attention to this to be sure

ah, turns out we are not using this type at all, because we have our own extended MessageContent type that we use instead

alexhancock · 2025-07-18T19:43:08Z

ui/desktop/src/api/types.gen.ts

+    data: string;
+    mimeType: string;
+    type: string;
+};


are there any frontend imports of this that may need to be updated? we don't have a ton of testing in the frontend unfortunately

…ntral-deeplinks * origin/main: (22 commits) feat: deprecate jetbrains extension in favor of public one (#2589) feat: Add LiteLLM provider with automatic prompt caching support (#3380) docs: update desktop instructions for managing sessions (#3522) docs: update desktop instructions for session recipes (#3521) Replace mcp_core::content types with rmcp::model types (#3500) docs: update desktop instructions for tool perms (#3518) docs: update desktop instructions for tool router (#3519) Alexhancock/reapply 3491 (#3515) docs: update mcp install instructions for desktop (#3504) Docs: Access settings in new UI (#3514) feat: switch from mcp_core::Role to rmcp::model::Role (#3488) Revert "fix the output not being visible issue (#3491)" (#3511) fix: Load and Use recipes in new window (#3501) fix: working dir was not being set correctly (#3477) Fix launching session in new window (#3497) Fix tool call allow still showing initial state in chat after navigating back (#3498) feat: add rmcp as a workspace dep (#3483) feat: consolidate subagent execution for dynamic tasks (#3444) fix token alert indicator/popovers hiding and showing (#3492) Fix llm errors not propagating to the ui and auto summarize not starting (#3490) ...

* main: Extension Library Improvements (#3541) fix(ui): enable selection of zero-config providers in desktop GUI (#3378) refactor: Renames recipe route to recipes to be consistent (#3540) Blog: Orchestrating 6 Subagents to Build a Collaborative API Playground (#3528) Catch json errors a little better (#3437) Rust debug (#3510) refactor: Centralise deeplink encode and decode into server (#3489) feat: deprecate jetbrains extension in favor of public one (#2589) feat: Add LiteLLM provider with automatic prompt caching support (#3380) docs: update desktop instructions for managing sessions (#3522) docs: update desktop instructions for session recipes (#3521) Replace mcp_core::content types with rmcp::model types (#3500) docs: update desktop instructions for tool perms (#3518) docs: update desktop instructions for tool router (#3519) Alexhancock/reapply 3491 (#3515) docs: update mcp install instructions for desktop (#3504) Docs: Access settings in new UI (#3514) feat: switch from mcp_core::Role to rmcp::model::Role (#3488) Revert "fix the output not being visible issue (#3491)" (#3511) fix: Load and Use recipes in new window (#3501)

Signed-off-by: Adam Tarantino <tarantino.adam@hey.com>

jamadeo marked this pull request as draft July 18, 2025 03:49

jamadeo changed the base branch from main to alexhancock/rmcp-role July 18, 2025 03:50

jamadeo force-pushed the jackamadeo/goose-rmcp-content branch from 339bfc8 to 634bdea Compare July 18, 2025 04:02

jamadeo requested a review from Copilot July 18, 2025 13:09

jamadeo commented Jul 18, 2025

View reviewed changes

crates/goose-cli/src/session/export.rs Outdated Show resolved Hide resolved

Copilot AI reviewed Jul 18, 2025

View reviewed changes

jamadeo commented Jul 18, 2025

View reviewed changes

crates/goose/src/context_mgmt/truncate.rs Show resolved Hide resolved

jamadeo commented Jul 18, 2025

View reviewed changes

crates/goose/src/message.rs Outdated Show resolved Hide resolved

alexhancock force-pushed the alexhancock/rmcp-role branch 3 times, most recently from 5aef1aa to 355ac32 Compare July 18, 2025 15:34

Base automatically changed from alexhancock/rmcp-role to main July 18, 2025 16:30

alexhancock approved these changes Jul 18, 2025

View reviewed changes

jamadeo added 13 commits July 18, 2025 15:22

Blow it all up

39625f3

goose try

0548781

finish it up

c8fb9f4

Fix test build

f6910d1

--fix

53e2809

One more import

40dc92f

Extract resource text in google format

e176f6a

checkpointing the converter

e1dab1d

Nearly there, but uses definitions/ ref instead of components/schemas

0209f22

Convert from schemars jsonschema to openapi

b868fec

Cast, for now

dfbd964

Unused imports

9ca1f0d

Fix some lint errors

9841c9e

jamadeo force-pushed the jackamadeo/goose-rmcp-content branch from f608459 to 9841c9e Compare July 18, 2025 19:34

jamadeo commented Jul 18, 2025

View reviewed changes

Move export back to a match

293e418

Make the type names explicit

2d6e386

alexhancock approved these changes Jul 18, 2025

View reviewed changes

Clean up and format

f4683d1

jamadeo marked this pull request as ready for review July 18, 2025 20:29

jamadeo added 2 commits July 18, 2025 16:31

Not really an error

6bfe64e

Revert some suggestions

31fc2db

jamadeo merged commit d529146 into main Jul 18, 2025
8 checks passed

jamadeo deleted the jackamadeo/goose-rmcp-content branch July 18, 2025 21:23

cbruyndoncx pushed a commit to cbruyndoncx/goose that referenced this pull request Jul 20, 2025

Replace mcp_core::content types with rmcp::model types (block#3500)

d741ef3

jamadeo mentioned this pull request Jul 22, 2025

Adopt RMCP #3578

Closed

4 tasks

atarantino pushed a commit to atarantino/goose that referenced this pull request Aug 5, 2025

Replace mcp_core::content types with rmcp::model types (block#3500)

6cdaa9d

Signed-off-by: Adam Tarantino <tarantino.adam@hey.com>

Replace mcp_core::content types with rmcp::model types #3500

Replace mcp_core::content types with rmcp::model types #3500

Uh oh!

Conversation

jamadeo commented Jul 18, 2025

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jamadeo Jul 18, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

jamadeo Jul 18, 2025

Choose a reason for hiding this comment

Uh oh!

alexhancock Jul 18, 2025

Choose a reason for hiding this comment

Uh oh!

jamadeo Jul 18, 2025

Choose a reason for hiding this comment

Uh oh!

jamadeo Jul 18, 2025

Choose a reason for hiding this comment

Uh oh!

alexhancock Jul 18, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants