diff --git a/Cargo.lock b/Cargo.lock
index 41980c82f..9d83fd525 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6069,9 +6069,9 @@ dependencies = [
 
 [[package]]
 name = "rmcp"
-version = "0.8.2"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e35d31f89beb59c83bc31363426da25b323ce0c2e5b53c7bf29867d16ee7898"
+checksum = "a2c66318b30535ccd0d3b39afaa4240d6b5a35328fb7672a28e3386c97472805"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -6098,9 +6098,9 @@ dependencies = [
 
 [[package]]
 name = "rmcp-macros"
-version = "0.8.2"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d88518b38110c439a03f0f4eee40e5105d648a530711cb87f98991e3f324a664"
+checksum = "49a19193e0d69bb1c96324b1b4daec078d4c8e76d734e53404c107437858a4d2"
 dependencies = [
  "darling 0.21.3",
  "proc-macro2",
diff --git a/Cargo.toml b/Cargo.toml
index d71772ecf..6accfb7e3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -134,7 +134,7 @@ winreg = "0.55.0"
 schemars = "1.0.4"
 jsonschema = "0.30.0"
 zip = "2.2.0"
-rmcp = { version = "0.8.0", features = ["client", "transport-sse-client-reqwest", "reqwest", "transport-streamable-http-client-reqwest", "transport-child-process", "tower", "auth"] }
+rmcp = { version = "0.8.4", features = ["client", "transport-sse-client-reqwest", "reqwest", "transport-streamable-http-client-reqwest", "transport-child-process", "tower", "auth"] }
 chat-cli-ui = { path = "crates/chat-cli-ui" }
 
 [workspace.lints.rust]
diff --git a/crates/agent/Cargo.toml b/crates/agent/Cargo.toml
index 08f219024..60f9e26ed 100644
--- a/crates/agent/Cargo.toml
+++ b/crates/agent/Cargo.toml
@@ -51,7 +51,7 @@ r2d2_sqlite.workspace = true
 rand.workspace = true
 regex.workspace = true
 reqwest.workspace = true
-rmcp = { version = "0.8.0", features = ["client", "transport-async-rw", "transport-child-process", "transport-io"] }
+rmcp = { version = "0.8.4", features = ["client", "transport-async-rw", "transport-child-process", "transport-io"] }
 rusqlite.workspace = true
 rustls.workspace = true
 rustls-native-certs.workspace = true