Skip to content

feat(acp): Honor MCP servers from clients like Zed (stdio + http) #6230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
codefromthecrypt merged 3 commits into from
Dec 23, 2025
Merged

feat(acp): Honor MCP servers from clients like Zed (stdio + http) #6230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99e4129
refactor(acp): switch to sacp for simpler API
codefromthecrypt Dec 20, 2025
4264221
Add ACP support for MCP servers (Stdio, Http transports)
codefromthecrypt Dec 21, 2025
9e3d6b5
no-mem
codefromthecrypt Dec 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
327 changes: 148 additions & 179 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion crates/goose-cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ goose = { path = "../goose" }
goose-bench = { path = "../goose-bench" }
goose-mcp = { path = "../goose-mcp" }
rmcp = { workspace = true }
agent-client-protocol = "0.9.0"
sacp = "9.0.0"
clap = { version = "4.4", features = ["derive"] }
cliclack = "0.3.5"
console = "0.16.1"
Expand Down
1,048 changes: 720 additions & 328 deletions crates/goose-cli/src/commands/acp.rs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion crates/goose-mcp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ description.workspace = true
workspace = true

[dependencies]
rmcp = { version = "0.8.1", features = ["server", "client", "transport-io", "macros"] }
rmcp = { workspace = true, features = ["server", "client", "transport-io", "macros"] }
Copy link
Collaborator

@alexhancock alexhancock Dec 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why this change? was this one just inconsistent?

Copy link
Collaborator Author

@codefromthecrypt codefromthecrypt Dec 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah just to have it match versions. copilot insisted ;)

anyhow = "1.0.94"
tokio = { version = "1", features = ["full"] }
tokio-stream = { version = "0.1", features = ["io-util"] }
Expand Down
3 changes: 2 additions & 1 deletion crates/goose/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ unbinder = "0.1.7"
winapi = { version = "0.3", features = ["wincred"] }

[dev-dependencies]
agent-client-protocol = "0.9.2"
sacp = "9.0.0"
criterion = "0.5"
serial_test = "3.2.0"
mockall = "0.13.1"
Expand All @@ -133,6 +133,7 @@ dotenvy = "0.15.7"
ctor = "0.2.9"
test-case = "3.3"
env-lock = "1.0.1"
rmcp = { workspace = true, features = ["transport-streamable-http-server"] }

[[example]]
name = "agent"
Expand Down
4 changes: 2 additions & 2 deletions crates/goose/src/agents/extension.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ pub enum ExtensionError {

pub type ExtensionResult<T> = Result<T, ExtensionError>;

#[derive(Debug, Clone, Deserialize, Serialize, Default, ToSchema)]
#[derive(Debug, Clone, Deserialize, Serialize, Default, ToSchema, PartialEq)]
pub struct Envs {
/// A map of environment variables to set, e.g. API_KEY -> some_secret, HOST -> host
#[serde(default)]
Expand Down Expand Up @@ -232,7 +232,7 @@ impl Envs {
}

/// Represents the different types of MCP extensions that can be added to the manager
#[derive(Debug, Clone, Deserialize, Serialize, ToSchema)]
#[derive(Debug, Clone, Deserialize, Serialize, ToSchema, PartialEq)]
#[serde(tag = "type")]
pub enum ExtensionConfig {
/// Server-sent events client with a URI endpoint
Expand Down
2 changes: 1 addition & 1 deletion crates/goose/src/permission/permission_confirmation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pub enum PrincipalType {
Tool,
}

#[derive(Debug, Serialize, Deserialize, Clone)]
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
pub struct PermissionConfirmation {
pub principal_type: PrincipalType,
pub permission: Permission,
Expand Down
Loading
Loading