Revert "Internal MCP Crate Cleanup (#4800)" (#4883)

Cargo.lock

@@ -1447,6 +1447,15 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "colored"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "combine"
 version = "4.6.7"
@@ -2177,6 +2186,22 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "eventsource-client"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c80c6714d1a380314fcb11a22eeff022e1e1c9642f0bb54e15dc9cb29f37b29"
+dependencies = [
+ "futures",
+ "hyper 0.14.32",
+ "hyper-rustls 0.24.2",
+ "hyper-timeout 0.4.1",
+ "log",
+ "pin-project",
+ "rand 0.8.5",
+ "tokio",
+]
+
 [[package]]
 name = "exr"
 version = "1.73.0"
@@ -2613,6 +2638,8 @@ dependencies = [
  "keyring",
  "lazy_static",
  "lru",
+ "mcp-client",
+ "mcp-core",
  "minijinja",
  "mockall",
  "nanoid",
@@ -2703,6 +2730,8 @@ dependencies = [
  "indicatif",
  "is-terminal",
  "jsonschema",
+ "mcp-client",
+ "mcp-core",
  "nix 0.30.1",
  "once_cell",
  "rand 0.8.5",
@@ -2738,7 +2767,7 @@ dependencies = [
  "base64 0.21.7",
  "chrono",
  "clap",
- "colored",
+ "colored 2.2.0",
  "devgen-tree-sitter-swift",
  "docx-rs",
  "etcetera",
@@ -2755,6 +2784,7 @@ dependencies = [
  "libc",
  "lopdf",
  "lru",
+ "mcp-core",
  "mpatch",
  "oauth2",
  "once_cell",
@@ -2811,6 +2841,7 @@ dependencies = [
  "goose",
  "goose-mcp",
  "http 1.2.0",
+ "mcp-core",
  "reqwest 0.12.12",
  "rmcp",
  "schemars",
@@ -3166,6 +3197,18 @@ dependencies = [
  "webpki-roots 0.26.8",
 ]
 
+[[package]]
+name = "hyper-timeout"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
+dependencies = [
+ "hyper 0.14.32",
+ "pin-project-lite",
+ "tokio",
+ "tokio-io-timeout",
+]
+
 [[package]]
 name = "hyper-timeout"
 version = "0.5.2"
@@ -3966,6 +4009,49 @@ dependencies = [
  "rayon",
 ]
 
+[[package]]
+name = "mcp-client"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "axum 0.8.1",
+ "base64 0.22.1",
+ "eventsource-client",
+ "futures",
+ "mcp-core",
+ "mockito",
+ "nanoid",
+ "nix 0.30.1",
+ "rand 0.8.5",
+ "reqwest 0.11.27",
+ "rmcp",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sha2",
+ "thiserror 1.0.69",
+ "tokio",
+ "tokio-util",
+ "tower 0.4.13",
+ "tracing",
+ "tracing-subscriber",
+ "url",
+ "webbrowser 1.0.4",
+]
+
+[[package]]
+name = "mcp-core"
+version = "0.1.0"
+dependencies = [
+ "rmcp",
+ "serde",
+ "serde_json",
+ "tempfile",
+ "thiserror 1.0.69",
+ "utoipa",
+]
+
 [[package]]
 name = "md-5"
 version = "0.10.6"
@@ -4068,6 +4154,30 @@ dependencies = [
  "syn 2.0.99",
 ]
 
+[[package]]
+name = "mockito"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7760e0e418d9b7e5777c0374009ca4c93861b9066f18cb334a20ce50ab63aa48"
+dependencies = [
+ "assert-json-diff",
+ "bytes",
+ "colored 3.0.0",
+ "futures-util",
+ "http 1.2.0",
+ "http-body 1.0.1",
+ "http-body-util",
+ "hyper 1.6.0",
+ "hyper-util",
+ "log",
+ "rand 0.9.1",
+ "regex",
+ "serde_json",
+ "serde_urlencoded",
+ "similar",
+ "tokio",
+]
+
 [[package]]
 name = "mpatch"
 version = "0.2.0"
@@ -4076,7 +4186,7 @@ checksum = "80198b9262c39e1178905412aa9cbda2f62b7b279f437b057d2a4f225e42befd"
 dependencies = [
  "anyhow",
  "clap",
- "colored",
+ "colored 2.2.0",
  "env_logger",
  "log",
  "similar",
@@ -5378,10 +5488,12 @@ dependencies = [
  "system-configuration",
  "tokio",
  "tokio-rustls 0.24.1",
+ "tokio-util",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
+ "wasm-streams",
  "web-sys",
  "winreg",
 ]
@@ -6873,6 +6985,16 @@ dependencies = [
  "uuid",
 ]
 
+[[package]]
+name = "tokio-io-timeout"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf"
+dependencies = [
+ "pin-project-lite",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-macros"
 version = "2.5.0"
@@ -6991,7 +7113,7 @@ dependencies = [
  "http-body 1.0.1",
  "http-body-util",
  "hyper 1.6.0",
- "hyper-timeout",
+ "hyper-timeout 0.5.2",
  "hyper-util",
  "percent-encoding",
  "pin-project",