Updating to rmcp 0.3 (#31)

Author: Shchvova

.github/workflows/build.yml

@@ -5,7 +5,7 @@ on:
   - pull_request
 
 env:
-  CARGO_PKG_VERSION: "0.1.${{ github.run_number }}"
+  CARGO_PKG_VERSION: "0.2.${{ github.run_number }}"
 
 permissions:
   contents: write

Cargo.lock

@@ -6,7 +6,7 @@ publish = false
 license = "MIT"
 
 [dependencies]
-rmcp = { git = "https://github.com/modelcontextprotocol/rust-sdk", rev = "db03f63e76b5b32f65d34a1bd08ae56dab595f60", features = ["server", "transport-io"] }
+rmcp = { version = "0.3", features = ["server", "transport-io"] }
 tokio = { version = "1", features = ["full"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

Cargo.toml

@@ -3,7 +3,7 @@ use librojo::cli;
 fn main() {
     let out_dir = std::env::var_os("OUT_DIR").unwrap();
     let dest_path = std::path::PathBuf::from(&out_dir).join("MCPStudioPlugin.rbxm");
-    eprintln!("Rebuilding plugin: {:?}", dest_path);
+    eprintln!("Rebuilding plugin: {dest_path:?}");
     let options = cli::Options {
         global: cli::GlobalOptions {
             verbosity: 1,

build.rs

@@ -151,7 +151,7 @@ async fn install_internal() -> Result<String> {
 
     println!();
     let msg = get_message(successes.join("\n"));
-    println!("{}", msg);
+    println!("{msg}");
     Ok(msg)
 }
 
@@ -171,7 +171,7 @@ pub async fn install() -> Result<()> {
     let alert_builder = match install_internal().await {
         Err(e) => DialogBuilder::message()
             .set_level(MessageLevel::Error)
-            .set_text(format!("Errors occurred: {:#}", e)),
+            .set_text(format!("Errors occurred: {e:#}")),
         Ok(msg) => DialogBuilder::message()
             .set_level(MessageLevel::Info)
             .set_text(msg),

src/install.rs

@@ -3,14 +3,16 @@ use axum::http::StatusCode;
 use axum::response::IntoResponse;
 use axum::{extract::State, Json};
 use color_eyre::eyre::{Error, OptionExt};
-use rmcp::model::{
-    CallToolResult, Content, ErrorData, Implementation, ProtocolVersion, ServerCapabilities,
-    ServerInfo,
+use rmcp::{
+    handler::server::tool::Parameters,
+    model::{
+        CallToolResult, Content, Implementation, ProtocolVersion, ServerCapabilities, ServerInfo,
+    },
+    schemars, tool, tool_handler, tool_router, ErrorData, ServerHandler,
 };
-use rmcp::tool;
-use rmcp::{Error as McpError, ServerHandler};
 use serde::{Deserialize, Serialize};
 use std::collections::{HashMap, VecDeque};
+use std::future::Future;
 use std::sync::Arc;
 use tokio::sync::oneshot::Receiver;
 use tokio::sync::{mpsc, watch, Mutex};
@@ -70,9 +72,10 @@ impl ToolArguments {
 #[derive(Clone)]
 pub struct RBXStudioServer {
     state: PackedState,
+    tool_router: rmcp::handler::server::tool::ToolRouter<Self>,
 }
 
-#[tool(tool_box)]
+#[tool_handler]
 impl ServerHandler for RBXStudioServer {
     fn get_info(&self) -> ServerInfo {
         ServerInfo {
@@ -87,27 +90,39 @@ impl ServerHandler for RBXStudioServer {
     }
 }
 
-#[derive(Deserialize, Serialize, Clone, Debug)]
+#[derive(Debug, Deserialize, Serialize, schemars::JsonSchema, Clone)]
+struct RunCode {
+    #[schemars(description = "Code to run")]
+    command: String,
+}
+#[derive(Debug, Deserialize, Serialize, schemars::JsonSchema, Clone)]
+struct InsertModel {
+    #[schemars(description = "Query to search for the model")]
+    query: String,
+}
+
+#[derive(Debug, Deserialize, Serialize, schemars::JsonSchema, Clone)]
 enum ToolArgumentValues {
-    RunCode { command: String },
-    InsertModel { query: String },
+    RunCode(RunCode),
+    InsertModel(InsertModel),
 }
-#[tool(tool_box)]
+#[tool_router]
 impl RBXStudioServer {
     pub fn new(state: PackedState) -> Self {
-        Self { state }
+        Self {
+            state,
+            tool_router: Self::tool_router(),
+        }
     }
 
     #[tool(
         description = "Runs a command in Roblox Studio and returns the printed output. Can be used to both make changes and retrieve information"
     )]
     async fn run_code(
         &self,
-        #[tool(param)]
-        #[schemars(description = "code to run")]
-        command: String,
-    ) -> Result<CallToolResult, McpError> {
-        self.generic_tool_run(ToolArgumentValues::RunCode { command })
+        Parameters(args): Parameters<RunCode>,
+    ) -> Result<CallToolResult, ErrorData> {
+        self.generic_tool_run(ToolArgumentValues::RunCode(args))
             .await
     }
 
@@ -116,15 +131,16 @@ impl RBXStudioServer {
     )]
     async fn insert_model(
         &self,
-        #[tool(param)]
-        #[schemars(description = "Query to search for the model.")]
-        query: String,
-    ) -> Result<CallToolResult, McpError> {
-        self.generic_tool_run(ToolArgumentValues::InsertModel { query })
+        Parameters(args): Parameters<InsertModel>,
+    ) -> Result<CallToolResult, ErrorData> {
+        self.generic_tool_run(ToolArgumentValues::InsertModel(args))
             .await
     }
 
-    async fn generic_tool_run(&self, args: ToolArgumentValues) -> Result<CallToolResult, McpError> {
+    async fn generic_tool_run(
+        &self,
+        args: ToolArgumentValues,
+    ) -> Result<CallToolResult, ErrorData> {
         let (command, id) = ToolArguments::new(args);
         tracing::debug!("Running command: {:?}", command);
         let (tx, mut rx) = mpsc::unbounded_channel::<Result<String>>();