feat(mcp): logs on stderr, improve args (#2083)

* wip: improve mcp server

* typo

Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>

* nit

---------

Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>

Author: jonaro00

Cargo.lock

@@ -103,7 +103,7 @@ pub fn parse_args() -> (ShuttleArgs, bool) {
 
 pub fn setup_tracing(debug: bool) {
     registry()
-        .with(fmt::layer())
+        .with(fmt::layer().with_writer(std::io::stderr))
         .with(
             // let user set RUST_LOG if they want to
             EnvFilter::try_from_default_env().unwrap_or_else(|_| {

cargo-shuttle/src/lib.rs

@@ -13,4 +13,5 @@ rmcp = { workspace = true, features = ["server", "transport-io", "macros"] }
 schemars = { workspace = true }
 serde = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
+tracing = { workspace = true }
 urlencoding = { workspace = true }

mcp/Cargo.toml

@@ -8,7 +8,9 @@ mod tools;
 mod utils;
 
 pub async fn run_mcp_server() -> Result<(), anyhow::Error> {
+    tracing::info!("Starting Shuttle MCP server...");
     let service = ShuttleMcpServer::new().serve(stdio()).await?;
+    tracing::info!("Started Shuttle MCP server!");
     service.waiting().await?;
     Ok(())
 }

mcp/src/lib.rs

@@ -1,12 +1,14 @@
-use crate::tools::{deployment::*, docs::*, logs::*, project::*};
-use crate::utils::run_tool;
 use rmcp::{
     handler::server::{tool::ToolRouter, wrapper::Parameters},
     model::{ServerCapabilities, ServerInfo},
     tool, tool_handler, tool_router, ServerHandler,
 };
+use tracing::instrument;
 
-#[derive(serde::Serialize, serde::Deserialize, schemars::JsonSchema)]
+use crate::tools::{deployment::*, docs::*, logs::*, project::*};
+use crate::utils::run_tool;
+
+#[derive(Debug, serde::Serialize, serde::Deserialize, schemars::JsonSchema)]
 struct SearchDocsArgs {
     #[schemars(description = "Search query for documentation")]
     query: String,
@@ -27,11 +29,13 @@ impl ShuttleMcpServer {
 
 #[tool_router]
 impl ShuttleMcpServer {
+    #[instrument(skip(self))]
     #[tool(description = "Deploy a project")]
     async fn deploy(&self, Parameters(args): Parameters<DeployArgs>) -> Result<String, String> {
         run_tool(deploy(args)).await
     }
 
+    #[instrument(skip(self))]
     #[tool(description = "List the deployments for a service")]
     async fn deployment_list(
         &self,
@@ -40,6 +44,7 @@ impl ShuttleMcpServer {
         run_tool(deployment_list(args)).await
     }
 
+    #[instrument(skip(self))]
     #[tool(description = "View status of a deployment")]
     async fn deployment_status(
         &self,
@@ -48,11 +53,13 @@ impl ShuttleMcpServer {
         run_tool(deployment_status(args)).await
     }
 
+    #[instrument(skip(self))]
     #[tool(description = "View build and deployment logs")]
     async fn logs(&self, Parameters(args): Parameters<LogsArgs>) -> Result<String, String> {
         run_tool(logs(args)).await
     }
 
+    #[instrument(skip(self))]
     #[tool(description = "Get the status of this project on Shuttle")]
     async fn project_status(
         &self,
@@ -61,14 +68,13 @@ impl ShuttleMcpServer {
         run_tool(project_status(args)).await
     }
 
+    #[instrument(skip(self))]
     #[tool(description = "List all projects you have access to")]
-    async fn project_list(
-        &self,
-        Parameters(args): Parameters<ProjectListArgs>,
-    ) -> Result<String, String> {
-        run_tool(project_list(args)).await
+    async fn project_list(&self) -> Result<String, String> {
+        run_tool(project_list()).await
     }
 
+    #[instrument(skip(self))]
     #[tool(description = "Search Shuttle documentation")]
     async fn search_docs(
         &self,
@@ -80,6 +86,7 @@ impl ShuttleMcpServer {
 
 #[tool_handler]
 impl ServerHandler for ShuttleMcpServer {
+    #[instrument(skip(self))]
     fn get_info(&self) -> ServerInfo {
         ServerInfo {
             instructions: Some(

mcp/src/mcp.rs

@@ -1,6 +1,6 @@
 use crate::utils::execute_command;
 
-#[derive(serde::Serialize, serde::Deserialize, schemars::JsonSchema)]
+#[derive(Debug, serde::Serialize, serde::Deserialize, schemars::JsonSchema)]
 pub struct DeployArgs {
     #[schemars(description = "Specify the working directory")]
     cwd: String,
@@ -12,7 +12,7 @@ pub struct DeployArgs {
     project_id: Option<String>,
 }
 
-#[derive(serde::Serialize, serde::Deserialize, schemars::JsonSchema)]
+#[derive(Debug, serde::Serialize, serde::Deserialize, schemars::JsonSchema)]
 pub struct DeploymentListArgs {
     #[schemars(description = "Specify the working directory")]
     cwd: String,
@@ -26,7 +26,7 @@ pub struct DeploymentListArgs {
     project_id: Option<String>,
 }
 
-#[derive(serde::Serialize, serde::Deserialize, schemars::JsonSchema)]
+#[derive(Debug, serde::Serialize, serde::Deserialize, schemars::JsonSchema)]
 pub struct DeploymentStatusArgs {
     #[schemars(description = "Specify the working directory")]
     cwd: String,

mcp/src/tools/deployment.rs

@@ -1,6 +1,6 @@
 use crate::utils::execute_command;
 
-#[derive(serde::Serialize, serde::Deserialize, schemars::JsonSchema)]
+#[derive(Debug, serde::Serialize, serde::Deserialize, schemars::JsonSchema)]
 pub struct LogsArgs {
     #[schemars(description = "Specify the working directory")]
     cwd: String,

mcp/src/tools/logs.rs

@@ -1,6 +1,6 @@
 use crate::utils::execute_command;
 
-#[derive(serde::Serialize, serde::Deserialize, schemars::JsonSchema)]
+#[derive(Debug, serde::Serialize, serde::Deserialize, schemars::JsonSchema)]
 pub struct ProjectStatusArgs {
     #[schemars(description = "Specify the working directory")]
     cwd: String,
@@ -10,12 +10,6 @@ pub struct ProjectStatusArgs {
     project_id: Option<String>,
 }
 
-#[derive(serde::Serialize, serde::Deserialize, schemars::JsonSchema)]
-pub struct ProjectListArgs {
-    #[schemars(description = "Specify the working directory")]
-    cwd: String,
-}
-
 pub async fn project_status(params: ProjectStatusArgs) -> Result<String, String> {
     let mut args = vec!["project".to_string(), "status".to_string()];
 
@@ -32,8 +26,8 @@ pub async fn project_status(params: ProjectStatusArgs) -> Result<String, String>
     execute_command("shuttle", args, &params.cwd).await
 }
 
-pub async fn project_list(params: ProjectListArgs) -> Result<String, String> {
+pub async fn project_list() -> Result<String, String> {
     let args = vec!["project".to_string(), "list".to_string()];
 
-    execute_command("shuttle", args, &params.cwd).await
+    execute_command("shuttle", args, ".").await
 }

mcp/src/tools/project.rs

@@ -2,6 +2,7 @@ use std::future::Future;
 
 use reqwest::header::{HeaderMap, ORIGIN, USER_AGENT};
 use tokio::process::Command;
+use tracing::debug;
 
 pub async fn execute_command(
     command: &str,
@@ -33,7 +34,7 @@ pub async fn run_tool<F>(tool: F) -> Result<String, String>
 where
     F: Future<Output = Result<String, String>>,
 {
-    // Placeholder for running logic before/after every tool
+    debug!("Running tool"); // Instrument span wraps the event to display the tool name
     tool.await
 }