merge goose-acp crate into goose (#8726)

Author: jamadeo

AGENTS.md

@@ -47,7 +47,6 @@ git commit -s                # required for DCO sign-off
 ```
 crates/
 ├── goose              # core logic
-├── goose-acp          # Agent Client Protocol
 ├── goose-acp-macros   # ACP proc macros
 ├── goose-cli          # CLI entry
 ├── goose-server       # backend (binary: goosed)

CUSTOM_DISTROS.md

@@ -416,7 +416,7 @@ For the full ACP specification, see the [Agent Client Protocol documentation](ht
 - API client example: `ui/desktop/src/api/` (generated TypeScript client)
 
 **ACP**:
-- ACP server implementation: `crates/goose-acp/src/server.rs`
+- ACP server implementation: `crates/goose/src/acp/server.rs`
 - CLI integration: `crates/goose-cli/src/cli.rs` (Command::Acp)
 - Protocol library: `sacp` crate (Rust implementation of ACP)
 - Test client example: `test_acp_client.py`

Cargo.lock

@@ -205,7 +205,7 @@ check-acp-schema: generate-acp-types
     #!/usr/bin/env bash
     set -e
     echo "🔍 Checking ACP schema and generated types are up-to-date..."
-    if ! git diff --exit-code crates/goose-acp/acp-schema.json crates/goose-acp/acp-meta.json ui/sdk/src/generated/; then
+    if ! git diff --exit-code crates/goose/acp-schema.json crates/goose/acp-meta.json ui/sdk/src/generated/; then
       echo ""
       echo "❌ ACP generated files are out of date!"
       echo ""
@@ -217,8 +217,8 @@ check-acp-schema: generate-acp-types
 # Generate ACP JSON schema from Rust types
 generate-acp-schema:
     @echo "Generating ACP schema..."
-    cd crates/goose-acp && cargo run --bin generate-acp-schema
-    @echo "ACP schema generated: crates/goose-acp/acp-schema.json, crates/goose-acp/acp-meta.json"
+    cd crates/goose && cargo run --bin generate-acp-schema
+    @echo "ACP schema generated: crates/goose/acp-schema.json, crates/goose/acp-meta.json"
 
 # Generate ACP TypeScript types from JSON schema (requires generate-acp-schema first)
 generate-acp-types: generate-acp-schema

Justfile

@@ -22,7 +22,6 @@ path = "src/bin/generate_manpages.rs"
 [dependencies]
 clap_mangen = "0.2.31"
 goose = { path = "../goose", default-features = false }
-goose-acp = { path = "../goose-acp", default-features = false }
 goose-mcp = { path = "../goose-mcp" }
 rmcp = { workspace = true }
 clap = { workspace = true }
@@ -71,8 +70,8 @@ winapi = { workspace = true }
 
 [features]
 default = ["code-mode", "local-inference", "aws-providers", "telemetry", "otel", "rustls-tls"]
-code-mode = ["goose/code-mode", "goose-acp/code-mode"]
-local-inference = ["goose/local-inference", "goose-acp/local-inference"]
+code-mode = ["goose/code-mode"]
+local-inference = ["goose/local-inference"]
 aws-providers = ["goose/aws-providers"]
 cuda = ["goose/cuda", "local-inference"]
 telemetry = ["goose/telemetry"]

crates/goose-acp/Cargo.toml

@@ -1064,8 +1064,9 @@ async fn handle_mcp_command(server: McpCommand) -> Result<()> {
 }
 
 async fn handle_serve_command(host: String, port: u16, builtins: Vec<String>) -> Result<()> {
+    use goose::acp::server_factory::{AcpServer, AcpServerFactoryConfig};
+    use goose::acp::transport::create_router;
     use goose::config::paths::Paths;
-    use goose_acp::server_factory::{AcpServer, AcpServerFactoryConfig};
     use std::net::SocketAddr;
     use std::sync::Arc;
     use tracing::info;
@@ -1081,7 +1082,7 @@ async fn handle_serve_command(host: String, port: u16, builtins: Vec<String>) ->
         data_dir: Paths::data_dir(),
         config_dir: Paths::config_dir(),
     }));
-    let router = goose_acp::transport::create_router(server);
+    let router = create_router(server);
 
     let addr: SocketAddr = format!("{}:{}", host, port).parse()?;
     info!("Starting ACP server on {}", addr);
@@ -1766,7 +1767,7 @@ pub async fn cli() -> anyhow::Result<()> {
         Some(Command::Doctor {}) => crate::commands::doctor::handle_doctor().await,
         Some(Command::Info { verbose }) => handle_info(verbose),
         Some(Command::Mcp { server }) => handle_mcp_command(server).await,
-        Some(Command::Acp { builtins }) => goose_acp::server::run(builtins).await,
+        Some(Command::Acp { builtins }) => goose::acp::server::run(builtins).await,
         Some(Command::Serve {
             host,
             port,

crates/goose-acp/src/lib.rs

@@ -82,7 +82,7 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 serde_urlencoded = "0.7"
 jsonschema = "0.30.0"
-uuid = { workspace = true }
+uuid = { workspace = true, features = ["v7"] }
 regex = { workspace = true }
 async-trait = { workspace = true }
 async-stream = { workspace = true }
@@ -96,7 +96,7 @@ nanoid = "0.4"
 sha2 = { workspace = true }
 base64 = { workspace = true }
 url = { workspace = true }
-axum = { workspace = true }
+axum = { workspace = true, features = ["ws"] }
 webbrowser = { workspace = true }
 lazy_static = "1.5.0"
 tracing = { workspace = true }
@@ -190,6 +190,9 @@ pem = { version = "3", optional = true }
 pkcs1 = { version = "0.7", default-features = false, features = ["pkcs8"], optional = true }
 pkcs8 = { version = "0.10", default-features = false, features = ["alloc"], optional = true }
 sec1 = { version = "0.7", default-features = false, features = ["der", "pkcs8"], optional = true }
+goose-acp-macros = { version = "1.31.0", path = "../goose-acp-macros" }
+tower-http = { workspace = true, features = ["cors"] }
+http-body-util = "0.1.3"
 
 
 [target.'cfg(target_os = "windows")'.dependencies]
@@ -222,6 +225,7 @@ opentelemetry_sdk = { workspace = true, features = ["testing"] }
 goose-test-support = { path = "../goose-test-support" }
 bytes.workspace = true
 http.workspace = true
+goose-mcp = { path = "../goose-mcp" }
 
 [[example]]
 name = "agent"
@@ -244,11 +248,17 @@ path = "src/bin/analyze_cli.rs"
 name = "build_canonical_models"
 path = "src/providers/canonical/build_canonical_models.rs"
 
+[[bin]]
+name = "generate-acp-schema"
+path = "src/bin/generate_acp_schema.rs"
+
 [package.metadata.cargo-machete]
 
 ignored = [
     # Used only on windows
     "winapi",
     # Used to provide extras imports for sacp
     "agent-client-protocol-schema",
+    # Used via http transport
+    "http-body-util",
 ]