split execute and instrospection

Author: Jephuff

crates/apollo-mcp-server/src/main.rs

@@ -62,10 +62,14 @@ struct Args {
     #[arg(long)]
     sse_port: Option<u16>,
 
-    /// Expose the schema to the MCP client through `introspect` and `execute` tools
+    /// Expose the schema to the MCP client through `introspect` tool
     #[arg(long, short = 'i')]
     introspection: bool,
 
+    /// Allow the use of the `execute` tool with operations build from the schema tool
+    #[arg(long)]
+    execute_introspection: bool,
+
     /// Enable use of uplink to get the schema and persisted queries (requires APOLLO_KEY and APOLLO_GRAPH_REF)
     #[arg(long, short = 'u')]
     uplink: bool,
@@ -160,6 +164,7 @@ async fn main() -> anyhow::Result<()> {
         .explorer(args.explorer)
         .headers(default_headers)
         .introspection(args.introspection)
+        .execute_introspection(args.execute_introspection)
         .mutation_mode(args.allow_mutations)
         .disable_type_description(args.disable_type_description)
         .disable_schema_description(args.disable_schema_description)

crates/apollo-mcp-server/src/server.rs

@@ -46,6 +46,7 @@ pub struct Server {
     endpoint: String,
     headers: HeaderMap,
     introspection: bool,
+    execute_introspection: bool,
     explorer: bool,
     custom_scalar_map: Option<CustomScalarMap>,
     mutation_mode: MutationMode,
@@ -72,6 +73,7 @@ impl Server {
         endpoint: String,
         headers: Headers,
         introspection: bool,
+        execute_introspection: bool,
         explorer: bool,
         custom_scalar_map: Option<CustomScalarMap>,
         mutation_mode: MutationMode,
@@ -90,6 +92,7 @@ impl Server {
             endpoint,
             headers,
             introspection,
+            execute_introspection,
             explorer,
             custom_scalar_map,
             mutation_mode,
@@ -138,6 +141,7 @@ struct Starting {
     endpoint: String,
     headers: HeaderMap,
     introspection: bool,
+    execute_introspection: bool,
     explorer: bool,
     custom_scalar_map: Option<CustomScalarMap>,
     mutation_mode: MutationMode,
@@ -179,7 +183,9 @@ impl Starting {
             )
             .await?;
 
-        let execute_tool = self.introspection.then(|| Execute::new(self.mutation_mode));
+        let execute_tool = self
+            .execute_introspection
+            .then(|| Execute::new(self.mutation_mode));
 
         let root_query_type = self
             .introspection
@@ -399,6 +405,7 @@ impl StateMachine {
             endpoint: server.endpoint,
             headers: server.headers,
             introspection: server.introspection,
+            execute_introspection: server.execute_introspection,
             explorer: server.explorer,
             custom_scalar_map: server.custom_scalar_map,
             mutation_mode: server.mutation_mode,