diff --git a/Cargo.lock b/Cargo.lock
index de6a9ad..ef9c856 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -970,7 +970,7 @@ dependencies = [
  "petgraph",
  "predicates",
  "rmcp",
- "rmcp-macros",
+ "rmcp-macros 2.1.0",
  "rusqlite",
  "schemars",
  "serde",
@@ -1202,7 +1202,7 @@ dependencies = [
  "pastey",
  "pin-project-lite",
  "process-wrap",
- "rmcp-macros",
+ "rmcp-macros 1.8.0",
  "schemars",
  "serde",
  "serde_json",
@@ -1215,9 +1215,22 @@ dependencies = [
 
 [[package]]
 name = "rmcp-macros"
-version = "1.4.0"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1aad0035b69380782d78ea95b508327e6deaa2235909053e596eea8f27b5e1d5"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "serde_json",
+ "syn",
+]
+
+[[package]]
+name = "rmcp-macros"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2391e4ae47f314e70eaafb6c7bd82e495e770b935448864446302143019151f"
+checksum = "2ee70afb7956da9f30d5348a2539b5eb90d9038f834463657ab717076ac3b1ad"
 dependencies = [
  "darling",
  "proc-macro2",
diff --git a/Cargo.toml b/Cargo.toml
index 3fff474..7cc2a19 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -42,7 +42,7 @@ rmcp = { version = "=1.4.0", optional = true, features = [
   "schemars",
 ] }
 # rmcp's caret macro dependency can resolve to an incompatible later 1.x API.
-rmcp-macros = { version = "=1.4.0", optional = true }
+rmcp-macros = { version = "=2.1.0", optional = true }
 schemars = { version = "1.2.0", optional = true, features = ["derive"] }
 glob = "0.3.3"