Skip to content

Commit 752d524

Browse files
authored
Mcp enablement squashed (#925)
* Squashed mcp-enablement changes * moves shellexpand to workspace dep * reverts changes in lock file * fixes tests * fixes fmt * updates lock file * Revert "updates lock file" This reverts commit f847c6f. * uses lock file from main * updates lock file * regenerates lock file * updates ci workflow to do a full fetch * allows lock file to be generated offline in the ci * Revert "allows lock file to be generated offline in the ci" This reverts commit 40a3b1a. * allows all custom tool actions * disables cache to get through CI * Revert "disables cache to get through CI" This reverts commit 46277c8. * force regenerate lock file * force regenerate lock file for test * baselines lock file to main * reverts lock file regenerate step * merges in main
1 parent 151873d commit 752d524

21 files changed

+1900
-19
lines changed

Cargo.lock

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+2
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ indicatif = "0.17.11"
8686
indoc = "2.0.6"
8787
insta = "1.42.2"
8888
libc = "0.2.171"
89+
mcp_client = { path = "crates/mcp_client" }
8990
mimalloc = "0.1.43"
9091
nix = { version = "0.29.0", features = [
9192
"feature",
@@ -123,6 +124,7 @@ reqwest = { version = "0.12.14", default-features = false, features = [
123124
] }
124125
ring = "0.17.14"
125126
rusqlite = { version = "0.32.1", features = ["bundled", "serde_json"] }
127+
shellexpand = "3.0.0"
126128
shell-color = { path = "crates/shell-color" }
127129
semver = { version = "1.0.26", features = ["serde"] }
128130
serde = { version = "1.0.219", features = ["derive", "rc"] }

crates/fig_desktop/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ rfd = "0.15.1"
7575
semver.workspace = true
7676
serde.workspace = true
7777
serde_json.workspace = true
78-
shellexpand = "3.0.0"
78+
shellexpand.workspace = true
7979
sysinfo.workspace = true
8080
tao = { version = "0.31.1", features = ["serde"] }
8181
tempfile.workspace = true

crates/fig_desktop_api/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ fig_util.workspace = true
3030
fnv = "1.0.7"
3131
serde.workspace = true
3232
serde_json.workspace = true
33-
shellexpand = "3.0.0"
33+
shellexpand.workspace = true
3434
thiserror.workspace = true
3535
tokio.workspace = true
3636
tracing.workspace = true

crates/figterm/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ serde.workspace = true
5656
serde_json.workspace = true
5757
shell-color.workspace = true
5858
shell-words = "1.1"
59-
shellexpand = "3.1.0"
59+
shellexpand.workspace = true
6060
shlex.workspace = true
6161
sysinfo.workspace = true
6262
time.workspace = true

crates/mcp_client/Cargo.toml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
[package]
2+
name = "mcp_client"
3+
authors.workspace = true
4+
edition.workspace = true
5+
homepage.workspace = true
6+
publish.workspace = true
7+
version.workspace = true
8+
license.workspace = true
9+
10+
[lints]
11+
workspace = true
12+
13+
[features]
14+
default = []
15+
16+
[[bin]]
17+
name = "test_mcp_server"
18+
path = "test_mcp_server/test_server.rs"
19+
test = true
20+
doc = false
21+
22+
[dependencies]
23+
tokio.workspace = true
24+
serde.workspace = true
25+
serde_json.workspace = true
26+
async-trait.workspace = true
27+
tracing.workspace = true
28+
thiserror.workspace = true
29+
uuid.workspace = true
30+
nix.workspace = true

0 commit comments

Comments
 (0)