diff --git a/Cargo.lock b/Cargo.lock
index a27bb55693f2..0be7e3838948 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -27,7 +27,7 @@ checksum = "6903a00e8ac822f9bacac59a1932754d7387c72ebb7c9c7439ad021505591da4"
 dependencies = [
  "anyhow",
  "derive_more",
- "schemars 1.2.0",
+ "schemars",
  "serde",
  "serde_json",
  "strum",
@@ -95,12 +95,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "anes"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
-
 [[package]]
 name = "ansi_colours"
 version = "1.2.3"
@@ -1192,7 +1186,7 @@ checksum = "f280f65ce85b880919349bbfcb204930291251eedcb2e5f84ce2f51df969c162"
 dependencies = [
  "git-version",
  "shell-escape",
- "sysinfo 0.33.1",
+ "sysinfo",
 ]
 
 [[package]]
@@ -1281,12 +1275,6 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "cast"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
-
 [[package]]
 name = "cbc"
 version = "0.1.2"
@@ -1359,33 +1347,6 @@ dependencies = [
  "windows-link 0.2.1",
 ]
 
-[[package]]
-name = "ciborium"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
-dependencies = [
- "ciborium-io",
- "ciborium-ll",
- "serde",
-]
-
-[[package]]
-name = "ciborium-io"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
-
-[[package]]
-name = "ciborium-ll"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
-dependencies = [
- "ciborium-io",
- "half",
-]
-
 [[package]]
 name = "cipher"
 version = "0.4.4"
@@ -1775,42 +1736,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "criterion"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
-dependencies = [
- "anes",
- "cast",
- "ciborium",
- "clap",
- "criterion-plot",
- "is-terminal",
- "itertools 0.10.5",
- "num-traits",
- "once_cell",
- "oorandom",
- "plotters",
- "rayon",
- "regex",
- "serde",
- "serde_derive",
- "serde_json",
- "tinytemplate",
- "walkdir",
-]
-
-[[package]]
-name = "criterion-plot"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
-dependencies = [
- "cast",
- "itertools 0.10.5",
-]
-
 [[package]]
 name = "croner"
 version = "2.2.0"
@@ -2070,7 +1995,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587"
 dependencies = [
  "powerfmt",
- "serde_core",
 ]
 
 [[package]]
@@ -2977,10 +2901,8 @@ dependencies = [
  "base64 0.21.7",
  "blake3",
  "boa_engine",
- "boa_gc",
  "chrono",
  "clap",
- "criterion",
  "ctor",
  "dashmap",
  "dirs 5.0.1",
@@ -3002,7 +2924,6 @@ dependencies = [
  "minijinja",
  "mockall",
  "nanoid",
- "oauth2",
  "once_cell",
  "opentelemetry",
  "opentelemetry-appender-tracing",
@@ -3015,7 +2936,7 @@ dependencies = [
  "reqwest 0.12.28",
  "rmcp",
  "sacp",
- "schemars 1.2.0",
+ "schemars",
  "serde",
  "serde_json",
  "serde_urlencoded",
@@ -3034,7 +2955,6 @@ dependencies = [
  "tokio-cron-scheduler",
  "tokio-stream",
  "tokio-util",
- "tonic",
  "tracing",
  "tracing-opentelemetry",
  "tracing-subscriber",
@@ -3078,7 +2998,6 @@ dependencies = [
 name = "goose-cli"
 version = "1.19.0"
 dependencies = [
- "agent-client-protocol-schema",
  "anstream",
  "anyhow",
  "async-trait",
@@ -3098,8 +3017,6 @@ dependencies = [
  "goose-mcp",
  "http 1.4.0",
  "indicatif",
- "is-terminal",
- "jsonschema",
  "nix 0.30.1",
  "once_cell",
  "open",
@@ -3138,39 +3055,29 @@ dependencies = [
  "async-trait",
  "base64 0.21.7",
  "chrono",
- "clap",
- "colored",
  "devgen-tree-sitter-swift",
  "docx-rs",
  "etcetera 0.11.0",
  "glob",
- "http-body-util",
- "hyper 1.8.1",
  "ignore",
  "image 0.24.9",
  "include_dir",
  "indoc",
- "keyring",
  "lazy_static",
  "libc",
  "lopdf",
  "lru",
  "mpatch",
- "oauth2",
  "once_cell",
  "rayon",
  "regex",
  "reqwest 0.11.27",
  "rmcp",
- "schemars 1.2.0",
+ "schemars",
  "serde",
  "serde_json",
- "serde_with",
  "serial_test",
  "shellexpand",
- "streaming-iterator",
- "sysinfo 0.32.1",
- "temp-env",
  "tempfile",
  "thiserror 1.0.69",
  "tokio",
@@ -3200,7 +3107,6 @@ name = "goose-server"
 version = "1.19.0"
 dependencies = [
  "anyhow",
- "async-trait",
  "axum 0.8.8",
  "base64 0.21.7",
  "bytes",
@@ -3218,7 +3124,7 @@ dependencies = [
  "reqwest 0.12.28",
  "rmcp",
  "rustls 0.23.31",
- "schemars 1.2.0",
+ "schemars",
  "serde",
  "serde_json",
  "serde_path_to_error",
@@ -3238,7 +3144,6 @@ dependencies = [
  "url",
  "utoipa",
  "uuid",
- "winreg 0.55.0",
 ]
 
 [[package]]
@@ -3838,7 +3743,6 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
  "autocfg",
  "hashbrown 0.12.3",
- "serde",
 ]
 
 [[package]]
@@ -3931,17 +3835,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "is-terminal"
-version = "0.4.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
-dependencies = [
- "hermit-abi",
- "libc",
- "windows-sys 0.61.2",
-]
-
 [[package]]
 name = "is-wsl"
 version = "0.4.0"
@@ -3958,15 +3851,6 @@ version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
 
-[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itertools"
 version = "0.12.1"
@@ -5098,12 +4982,6 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "oorandom"
-version = "11.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
-
 [[package]]
 name = "open"
 version = "5.3.3"
@@ -5551,34 +5429,6 @@ dependencies = [
  "time",
 ]
 
-[[package]]
-name = "plotters"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
-dependencies = [
- "num-traits",
- "plotters-backend",
- "plotters-svg",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "plotters-backend"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
-
-[[package]]
-name = "plotters-svg"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
-dependencies = [
- "plotters-backend",
-]
-
 [[package]]
 name = "png"
 version = "0.17.16"
@@ -6159,7 +6009,7 @@ dependencies = [
  "wasm-bindgen-futures",
  "web-sys",
  "webpki-roots 0.25.4",
- "winreg 0.50.0",
+ "winreg",
 ]
 
 [[package]]
@@ -6255,7 +6105,7 @@ dependencies = [
  "rand 0.9.2",
  "reqwest 0.12.28",
  "rmcp-macros",
- "schemars 1.2.0",
+ "schemars",
  "serde",
  "serde_json",
  "sse-stream",
@@ -6530,7 +6380,7 @@ dependencies = [
  "jsonrpcmsg",
  "rmcp",
  "sacp-derive",
- "schemars 1.2.0",
+ "schemars",
  "serde",
  "serde_json",
  "thiserror 2.0.17",
@@ -6578,18 +6428,6 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
-[[package]]
-name = "schemars"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f"
-dependencies = [
- "dyn-clone",
- "ref-cast",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "schemars"
 version = "1.2.0"
@@ -6821,17 +6659,8 @@ version = "3.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fa237f2807440d238e0364a218270b98f767a00d3dada77b1c53ae88940e2e7"
 dependencies = [
- "base64 0.22.1",
- "chrono",
- "hex",
- "indexmap 1.9.3",
- "indexmap 2.12.1",
- "schemars 0.9.0",
- "schemars 1.2.0",
  "serde_core",
- "serde_json",
  "serde_with_macros",
- "time",
 ]
 
 [[package]]
@@ -7309,12 +7138,6 @@ version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8207e78455ffdf55661170876f88daf85356e4edd54e0a3dbc79586ca1e50cbe"
 
-[[package]]
-name = "streaming-iterator"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520"
-
 [[package]]
 name = "stringprep"
 version = "0.1.5"
@@ -7437,20 +7260,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "sysinfo"
-version = "0.32.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c33cd241af0f2e9e3b5c32163b873b29956890b5342e6745b917ce9d490f4af"
-dependencies = [
- "core-foundation-sys",
- "libc",
- "memchr",
- "ntapi",
- "rayon",
- "windows 0.57.0",
-]
-
 [[package]]
 name = "sysinfo"
 version = "0.33.1"
@@ -7769,16 +7578,6 @@ dependencies = [
  "zerovec",
 ]
 
-[[package]]
-name = "tinytemplate"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
-dependencies = [
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "tinyvec"
 version = "1.10.0"
@@ -9433,16 +9232,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "winreg"
-version = "0.55.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb5a765337c50e9ec252c2069be9bf91c7df47afb103b642ba3a53bf8101be97"
-dependencies = [
- "cfg-if",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "winsafe"
 version = "0.0.19"
diff --git a/crates/goose-cli/Cargo.toml b/crates/goose-cli/Cargo.toml
index a043894f3765..7f4b21e1f7b0 100644
--- a/crates/goose-cli/Cargo.toml
+++ b/crates/goose-cli/Cargo.toml
@@ -20,7 +20,6 @@ goose-bench = { path = "../goose-bench" }
 goose-mcp = { path = "../goose-mcp" }
 rmcp = { workspace = true }
 sacp = { workspace = true }
-agent-client-protocol-schema = "0.10.5"
 clap = { version = "4.4", features = ["derive"] }
 cliclack = "0.3.5"
 console = "0.16.1"
@@ -29,7 +28,6 @@ dotenvy = "0.15.7"
 bat = "0.25.0"
 anyhow = "1.0"
 serde_json = "1.0"
-jsonschema = "0.30.0"
 tokio = { version = "1.43", features = ["full"] }
 futures = "0.3"
 serde = { version = "1.0", features = ["derive"] }  # For serialization
@@ -56,7 +54,6 @@ http = "1.0"
 webbrowser = {workspace = true}
 indicatif = "0.18.1"
 tokio-util = { version = "0.7.15", features = ["compat", "rt"] }
-is-terminal = "0.4.16"
 anstream = "0.6.18"
 url = "2.5.7"
 open = "5.3.2"
diff --git a/crates/goose-mcp/Cargo.toml b/crates/goose-mcp/Cargo.toml
index 2e6a87b33ff3..ba327beff3ef 100644
--- a/crates/goose-mcp/Cargo.toml
+++ b/crates/goose-mcp/Cargo.toml
@@ -37,8 +37,7 @@ chrono = { version = "0.4.38", features = ["serde"] }
 etcetera = { workspace = true }
 tempfile = "3.8"
 include_dir = "0.7.4"
-webbrowser = {workspace = true} 
-http-body-util = "0.1.2"
+webbrowser = {workspace = true}
 regex = "1.11.1"
 once_cell = "1.20.2"
 ignore = { workspace = true }
@@ -52,11 +51,8 @@ keyring = { version = "3.6.2", features = [
     "sync-secret-service",
     "vendored",
 ] }
-oauth2 = { version = "5.0.0", features = ["reqwest"] }
 utoipa = { version = "4.1", optional = true }
-hyper = "1"
-serde_with = "3"
-which = {workspace = true} 
+which = {workspace = true}
 glob = "0.3"
 lru = "0.12"
 tree-sitter = "0.21"
@@ -68,7 +64,6 @@ tree-sitter-java = "0.21"
 tree-sitter-kotlin = "0.3.8"
 devgen-tree-sitter-swift = "0.21.0"
 tree-sitter-ruby = "0.21.0"
-streaming-iterator = "0.1"
 rayon = "1.10"
 libc = "0.2"
 # TODO: Fork mpatch or replace with a custom implementation using `similar` crate
@@ -76,8 +71,6 @@ libc = "0.2"
 # ~1000 downloads). Pinned to exact version to prevent supply chain attacks.
 mpatch = "=0.2.0"
 tokio-util = "0.7.16"
-clap = { version = "4", features = ["derive"] }
-
 
 [dev-dependencies]
 serial_test = "3.0.0"
diff --git a/crates/goose/Cargo.toml b/crates/goose/Cargo.toml
index 9a2f93eb81e3..e109a572a269 100644
--- a/crates/goose/Cargo.toml
+++ b/crates/goose/Cargo.toml
@@ -68,8 +68,7 @@ tracing-opentelemetry = "0.28"
 opentelemetry = "0.27"
 opentelemetry-appender-tracing = "0.27"
 opentelemetry_sdk = { version = "0.27", features = ["rt-tokio", "metrics"] }
-opentelemetry-otlp = { version = "0.27", features = ["grpc-tonic", "http-proto", "reqwest-client"] }
-tonic = "0.12"
+opentelemetry-otlp = { version = "0.27", features = ["http-proto", "reqwest-client"] }
 keyring = { version = "3.6.2", features = ["apple-native", "windows-native", "sync-secret-service", "vendored"] }
 serde_yaml = "0.9.34"
 once_cell = "1.20.2"
@@ -102,7 +101,6 @@ unicode-normalization = "0.1"
 zip = "0.6"
 sys-info = "0.9"
 
-oauth2 = "5.0.0"
 schemars = { version = "1.0.4", default-features = false, features = ["derive"] }
 insta = "1.43.2"
 paste = "1.0.0"
@@ -112,7 +110,6 @@ indexmap = "2.12.0"
 ignore = { workspace = true }
 which = { workspace = true}
 boa_engine = "0.21.0"
-boa_gc = "0.21"
 unbinder = "0.1.7"
 
 [target.'cfg(target_os = "windows")'.dependencies]
@@ -121,7 +118,6 @@ winapi = { version = "0.3", features = ["wincred"] }
 [dev-dependencies]
 sacp = { workspace = true }
 agent-client-protocol-schema = "0.10.5"
-criterion = "0.5"
 serial_test = "3.2.0"
 mockall = "0.13.1"
 wiremock = "0.6.0"