Merge remote-tracking branch 'refs/remotes/origin/port-provider-test-to-ts' into port-provider-test-to-ts

Author: jamadeo

Cargo.lock

@@ -7,10 +7,6 @@ license.workspace = true
 repository.workspace = true
 description.workspace = true
 
-[[bin]]
-name = "goose-acp-server"
-path = "src/bin/server.rs"
-
 [[bin]]
 name = "generate-acp-schema"
 path = "src/bin/generate_acp_schema.rs"
@@ -44,10 +40,8 @@ url = { workspace = true }
 
 # HTTP server dependencies
 axum = { workspace = true, features = ["ws"] }
-clap = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 tower-http = { workspace = true, features = ["cors"] }
-tracing-subscriber = { workspace = true, features = ["env-filter", "json"] }
 async-stream = { workspace = true }
 http-body-util = "0.1.3"
 uuid = { workspace = true, features = ["v7"] }

crates/goose-acp/Cargo.toml

@@ -63,6 +63,7 @@ clap_complete = "4.5.62"
 comfy-table = "7.2.2"
 sha2 = { workspace = true }
 sigstore-verify = { version = "0.6", default-features = false }
+axum.workspace = true
 
 [target.'cfg(target_os = "windows")'.dependencies]
 winapi = { workspace = true }

crates/goose-acp/src/bin/server.rs

@@ -732,6 +732,26 @@ enum Command {
         builtins: Vec<String>,
     },
 
+    /// Start ACP server over HTTP and WebSocket
+    #[command(about = "Start ACP server over HTTP and WebSocket")]
+    Serve {
+        #[arg(long, default_value = "127.0.0.1")]
+        host: String,
+
+        #[arg(long, default_value = "3284")]
+        port: u16,
+
+        #[arg(
+            long = "with-builtin",
+            value_name = "NAME",
+            help = "Add builtin extensions by name (e.g., 'developer' or multiple: 'developer,github')",
+            long_help = "Add one or more builtin extensions that are bundled with goose by specifying their names, comma-separated",
+            value_delimiter = ',',
+            action = clap::ArgAction::Append
+        )]
+        builtins: Vec<String>,
+    },
+
     /// Start or resume interactive chat sessions
     #[command(
         about = "Start or resume interactive chat sessions",
@@ -1009,6 +1029,7 @@ fn get_command_name(command: &Option<Command>) -> &'static str {
         Some(Command::Info { .. }) => "info",
         Some(Command::Mcp { .. }) => "mcp",
         Some(Command::Acp { .. }) => "acp",
+        Some(Command::Serve { .. }) => "serve",
         Some(Command::Session { .. }) => "session",
         Some(Command::Project {}) => "project",
         Some(Command::Projects) => "projects",
@@ -1038,6 +1059,35 @@ async fn handle_mcp_command(server: McpCommand) -> Result<()> {
     Ok(())
 }
 
+async fn handle_serve_command(host: String, port: u16, builtins: Vec<String>) -> Result<()> {
+    use goose::config::paths::Paths;
+    use goose_acp::server_factory::{AcpServer, AcpServerFactoryConfig};
+    use std::net::SocketAddr;
+    use std::sync::Arc;
+    use tracing::info;
+
+    let builtins = if builtins.is_empty() {
+        vec!["developer".to_string()]
+    } else {
+        builtins
+    };
+
+    let server = Arc::new(AcpServer::new(AcpServerFactoryConfig {
+        builtins,
+        data_dir: Paths::data_dir(),
+        config_dir: Paths::config_dir(),
+    }));
+    let router = goose_acp::transport::create_router(server);
+
+    let addr: SocketAddr = format!("{}:{}", host, port).parse()?;
+    info!("Starting ACP server on {}", addr);
+
+    let listener = tokio::net::TcpListener::bind(addr).await?;
+    axum::serve(listener, router).await?;
+
+    Ok(())
+}
+
 async fn handle_session_subcommand(command: SessionCommand) -> Result<()> {
     match command {
         SessionCommand::List {
@@ -1708,6 +1758,11 @@ pub async fn cli() -> anyhow::Result<()> {
         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::Serve {
+            host,
+            port,
+            builtins,
+        }) => handle_serve_command(host, port, builtins).await,
         Some(Command::Session {
             command: Some(cmd), ..
         }) => handle_session_subcommand(cmd).await,

crates/goose-cli/Cargo.toml

@@ -45,6 +45,7 @@ use crate::providers::errors::ProviderError;
 use crate::recipe::{Author, Recipe, Response, Settings};
 use crate::scheduler_trait::SchedulerTrait;
 use crate::security::adversary_inspector::AdversaryInspector;
+use crate::security::egress_inspector::EgressInspector;
 use crate::security::security_inspector::SecurityInspector;
 use crate::session::extension_data::{EnabledExtensionsState, ExtensionState};
 use crate::session::{Session, SessionManager};
@@ -262,6 +263,7 @@ impl Agent {
 
         // Add security inspector (highest priority - runs first)
         tool_inspection_manager.add_inspector(Box::new(SecurityInspector::new()));
+        tool_inspection_manager.add_inspector(Box::new(EgressInspector::new()));
 
         // Add adversary inspector (LLM-based review, enabled by ~/.config/goose/adversary.md)
         tool_inspection_manager.add_inspector(Box::new(AdversaryInspector::new(provider.clone())));

crates/goose-cli/src/cli.rs

@@ -154,11 +154,8 @@ impl Agent {
         if skills.is_empty() {
             output.push_str("No skills installed.\n\n");
             output.push_str("Skills are loaded from SKILL.md files in:\n");
-            output.push_str("  - ~/.claude/skills/\n");
-            output.push_str("  - ~/.config/agents/skills/\n");
-            output.push_str("  - .goose/skills/ (in current directory)\n");
-            output.push_str("  - .claude/skills/ (in current directory)\n");
-            output.push_str("  - .agents/skills/ (in current directory)\n");
+            output.push_str("  - ~/.agents/skills/ (global)\n");
+            output.push_str("  - .agents/skills/ (in current project)\n");
         } else {
             output.push_str(&format!("**Installed skills ({}):**\n\n", skills.len()));
             for skill in &skills {

crates/goose/src/agents/agent.rs

@@ -410,6 +410,7 @@ fn discover_filesystem_sources(working_dir: &Path) -> Vec<Source> {
     let local_recipe_dirs: Vec<PathBuf> = vec![
         working_dir.to_path_buf(),
         working_dir.join(".goose/recipes"),
+        working_dir.join(".agents/recipes"),
     ];
 
     let global_recipe_dirs: Vec<PathBuf> = std::env::var("GOOSE_RECIPE_PATH")
@@ -419,7 +420,14 @@ fn discover_filesystem_sources(working_dir: &Path) -> Vec<Source> {
             let sep = if cfg!(windows) { ';' } else { ':' };
             p.split(sep).map(PathBuf::from).collect::<Vec<_>>()
         })
-        .chain([config.join("recipes")])
+        .chain(
+            [
+                Some(config.join("recipes")),
+                home.as_ref().map(|h| h.join(".agents/recipes")),
+            ]
+            .into_iter()
+            .flatten(),
+        )
         .collect();
 
     let local_skill_dirs: Vec<PathBuf> = vec![
@@ -429,6 +437,7 @@ fn discover_filesystem_sources(working_dir: &Path) -> Vec<Source> {
     ];
 
     let global_skill_dirs: Vec<PathBuf> = [
+        home.as_ref().map(|h| h.join(".agents/skills")),
         Some(config.join("skills")),
         home.as_ref().map(|h| h.join(".claude/skills")),
         home.as_ref().map(|h| h.join(".config/agents/skills")),
@@ -440,9 +449,11 @@ fn discover_filesystem_sources(working_dir: &Path) -> Vec<Source> {
     let local_agent_dirs: Vec<PathBuf> = vec![
         working_dir.join(".goose/agents"),
         working_dir.join(".claude/agents"),
+        working_dir.join(".agents/agents"),
     ];
 
     let global_agent_dirs: Vec<PathBuf> = [
+        home.as_ref().map(|h| h.join(".agents/agents")),
         Some(config.join("agents")),
         home.as_ref().map(|h| h.join(".claude/agents")),
     ]
@@ -1108,8 +1119,8 @@ impl SummonClient {
                 "No sources available for load/delegate.\n\n\
                  Sources are discovered from:\n\
                  • Current recipe's sub_recipes\n\
-                 • .goose/recipes/, .goose/skills/, .goose/agents/\n\
-                 • ~/.config/goose/recipes/, skills/, agents/\n\
+                 • .agents/skills/, .agents/recipes/, .agents/agents/ (project-level)\n\
+                 • ~/.agents/skills/, ~/.agents/agents/ (global)\n\
                  • GOOSE_RECIPE_PATH directories\n\
                  • Builtin skills",
             )]);

crates/goose/src/agents/execute_commands.rs

@@ -28,6 +28,14 @@ fn local_recipe_dirs() -> Vec<PathBuf> {
     local_dirs.push(get_recipe_library_dir(true));
     local_dirs.push(get_recipe_library_dir(false));
 
+    // Also scan .agents/recipes/ for consistency with the .agents/ convention
+    if let Ok(cwd) = env::current_dir() {
+        local_dirs.push(cwd.join(".agents/recipes"));
+    }
+    if let Some(home) = dirs::home_dir() {
+        local_dirs.push(home.join(".agents/recipes"));
+    }
+
     let mut dirs: Vec<PathBuf> = local_dirs
         .into_iter()
         .map(|dir| dir.canonicalize().unwrap_or(dir))